Merge "Use clang-r412851"