Merge "Change ant.prop to sdk.prop"