Merge 81668 from mainline.
Some formatting tweaks to clang(1)


git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_26@81700 91177308-0d34-0410-b5e6-96231b3b80d8