Merge "Remove unused clang-r407598b"