Merge "Fix Ant issue." into tools_r22