as it turns out, frameworks and headermaps are orthogonal. Make this so in

the internal representation.  This also fixes a bug where -I foo  -F foo would
not search foo as both a normal and framework include dir.

llvm-svn: 45092