Merge "Revert "Switch to clang-3625443."" am: 4932b9fb59
am: a7a3e4719d

Change-Id: I880c175120c5d39abb93196c890ed0068fc2b50d