Merge "clang-format many files."
am: a676df01e2

Change-Id: Iecaed7fd342df49d628c2bc68f1bf5439163d918