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

Change-Id: I5a68d9558e7144cf70387963b480eb876ceec5ac