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

Change-Id: If3c9e0e2b5ded2c3d1c343b0c0346db5e3739c90