Merge "Revert "Switch to clang-3625443.""