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

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

Change-Id: I9ea27dc158aa50c22ed161b6552c97b981c78ca4