Merge "Revert "Revert "Remove unused clang-3859424"""
am: 6c2eb897f9

Change-Id: I0cc783136198ee62608426b89197109774a8a9f6