Merge "CFI uses SIGTRAP on arm/arm64." am: 9b16a91b60 am: a32d98d3d0 am: 3023bd3b52

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

Change-Id: I2d56bb330af889bda544a7e12b9a629f09b0cd01