Merge "Remove unused clang-r383902b"