Fix a regression introduced by r131955 which broke #include_next in subtle situations

because the Angled directories and the System directories were not being uniqued 
together, breaking #include_next.  I'll see about a testcase, but it will be insane.

llvm-svn: 133212