Merge "Revert "Revert "Remove unused clang-3859424"""