[automerger skipped] [scudo] Rework dieOnMapUnmapError am: 4d022f5d4f am: 674e5ee755 -s ours

am skip reason: Merged-In Idc91a4187ddc9ad1aef8ab85ca021a6e2cc65566 with SHA-1 c79ab1b2c1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/scudo/+/14967144

Change-Id: I114f8b8f0d0a0dc3f555da22f605708b2e7a848c