Switch to clang-format from clang-4347831. am: c17234496f am: a594726464
am: 9dc7461702

Change-Id: I69f28892df57ba29c8011e4a9a0c9f93514f14b2