Merge "Add support for build-tools in ADT."