Merge "Update prebuilt Clang to build 4679922."