[modules] Fix a few places where merging wasn't performed if modules was disabled but local module visibilty was enabled.

llvm-svn: 239504
diff --git a/clang/test/Modules/Inputs/submodules-merge-defs/module.modulemap b/clang/test/Modules/Inputs/submodules-merge-defs/module.modulemap
index 82abdb0..f8ae60f 100644
--- a/clang/test/Modules/Inputs/submodules-merge-defs/module.modulemap
+++ b/clang/test/Modules/Inputs/submodules-merge-defs/module.modulemap
@@ -14,3 +14,8 @@
   header "merged-defs.h"
   use "stuff"
 }
+
+module "indirect" {
+  header "indirect.h"
+  use "merged-defs"
+}