Merge "CFI uses SIGTRAP on arm/arm64."