Preload module maps in normal user directories, too.

... in case someone decides to -I/usr/include <rdar://problem/15235948>.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193893 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Lex/HeaderSearch.cpp b/lib/Lex/HeaderSearch.cpp
index 2da2c9e..9e43dda 100644
--- a/lib/Lex/HeaderSearch.cpp
+++ b/lib/Lex/HeaderSearch.cpp
@@ -1173,9 +1173,8 @@
 void HeaderSearch::loadTopLevelSystemModules() {
   // Load module maps for each of the header search directories.
   for (unsigned Idx = 0, N = SearchDirs.size(); Idx != N; ++Idx) {
-    // We only care about normal system header directories.
-    if (!SearchDirs[Idx].isNormalDir() ||
-        SearchDirs[Idx].getDirCharacteristic() != SrcMgr::C_System) {
+    // We only care about normal header directories.
+    if (!SearchDirs[Idx].isNormalDir()) {
       continue;
     }