Merge "clang-format the rest of the files"
am: 1934619b8b

Change-Id: I6265495330a13f687628b2143b9f78eb25380104