Merge "Switch to clang-3688880."