Merge "Switch to clang-3625443." am: 296c345be9
am: 7c88a2f902

Change-Id: I8ad1085548ea629670d5b8e088752f2a1f953772