Merge "Switch to clang-2658975."