reapply clang-format

Change-Id: Ic04e8429b07fe9b7dc15dc836d16ba9f30317ee2
6 files changed