Merge "Switch to clang-2812033."