Merge "Import build tools from build 7499725"