Revert r302978 and r302981.

Revert the two commits to understand why the following aarch64 bot is
failing.

http://lab.llvm.org:8011/builders/libcxx-libcxxabi-libunwind-aarch64-linux

git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@303016 91177308-0d34-0410-b5e6-96231b3b80d8
2 files changed