Remove trailing whitespace and fix an 80-column violation. No functional change.

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