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

Change-Id: Ie1c1999060bfa12768aee4e9fa7c597f4d73c262