Cleanup new cxa guard implementation. am: 6eae8a4e93 am: e205f7693a

Original change: https://android-review.googlesource.com/c/platform/external/libcxxabi/+/1727436

Change-Id: I7146383f7de0e66fb03ebc0aca61a96ad4bc94b2