Fixed incorrect include file exit detection.  Added work-around to avoid error on header guard in nested include.  Fixed a couple of coding standard issues on variable names.

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