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

Change-Id: Ib1dc1fb2ce888f4ff8ff2f83a9d97f8cb6cccadb