Blindly try to fix the clang-tools-extra build since my local build doesn't appear to be picking it up

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@207230 91177308-0d34-0410-b5e6-96231b3b80d8
Slightly less blindly fixing clang-tools-extra now that I remember that the "check-clang" target doesn't check clang-tools-extra

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