Outdent this file by 2 spaces per the coding standards, and also clean up

whitespace at the end of lines since I'm already touching the whole file
anyways.

llvm-svn: 104403