Merge "Add support for build-tools."