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

Change-Id: I874c41aacd7e3f17f88a4f2ff54a16c6fac10042