Merge "Update ant's build.xml to support the build-tools SDK component."