Second try at r178075.  The llvm breakage has been fixed by r178240.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@178253 91177308-0d34-0410-b5e6-96231b3b80d8