Merge "Use clang-r407598"