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

Change-Id: I1491697e406ab4362625cffeacff4629a1faf7c2