Merge "Import build tools from build 7613987"