Merge commit '5564ee495bdd' from llvm.org/master into apple/main

git apple-llvm automerger · git apple-llvm automerger · commit 649e38c234c6 · 2020-10-17T00:15:34.000-07:00
diff --git a/clang/include/clang/module.modulemap b/clang/include/clang/module.modulemap
@@ -63,7 +63,6 @@ module Clang_Basic {
   textual header "Basic/OpenMPKinds.def"
   textual header "Basic/OperatorKinds.def"
   textual header "Basic/Sanitizers.def"
-  textual header "Basic/TargetCXXABI.def"
   textual header "Basic/TokenKinds.def"
   textual header "Basic/X86Target.def"
 
