Merge "Switch to clang-r377782c"