Broke out header file list reading into separate function. Moved options to front.  Removed some trailing spaces.

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