Back out the <type_traits> changes from r198431; they were breaking when building with glibc. Need to find a better solution for PR18218.

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