Switch to clang-format from clang-4347831.
am: c17234496f

Change-Id: I537f3be2ed6f94cd22a48b89ce1b038f55faee5f