Merge "Import build tools from build 5286479"