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

Change-Id: I4b778ae7dba56cf15079dfa516ebe4fdd343e98a