Merge "Fix setjmp.bug_152210274 with HWASan/stack MTE enabled." am: 688bddc1e5

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2501655

Change-Id: I1a2d2ee4620f51fea7ad08aaf44b8eb2b7d8c1af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>