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

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

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