[modules] Fix "prefer own module over others" rule when selecting a module for a header to work in the presence of module hierarchy.llvm-svn: 241936
[modules] When building a module, if there are multiple matches for a headerfile in the loaded module maps and one of them is from the current module,that's the right match.llvm-svn: 240350