My original upstream commits to fix the detection of the
<unordered_map> and <ext/hash_map> headers needed some fixes which
were committed later.

The original patches have now been replaced by all the needed commits
squashed into a single 'patch-fix-clang-support' diff.