Extended moduleImport test to test a module with more than one path component.  This required a change to the includes test, because of the change to the headers.

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