Revert "Fix libc++ build with android-20 and llvm-3.4"

Broke test/depr/depr.c.headers/locale_h.pass.cpp.

This reverts commit 7cbfc88cd3105dfb70a7a92c63289e973c4f0b9b.