Fix build after clang change r183781.

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

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