Merge "Properly support spaces in ant project directories." into tools_r13