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

Change-Id: I644f40bab1287a9f8b0a34fb3596a120cc31e61d