[PM] While I'm here, fix a few other clang-format issues. Pulls some
lines under 80-columns, etc.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@203434 91177308-0d34-0410-b5e6-96231b3b80d8