[automerger skipped] [scudo] Rework dieOnMapUnmapError am: 4d022f5d4f -s ours am: 14f3a6a75f -s ours

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

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

Change-Id: Id70b634a6c9cbbe2294c28a5d0c975e1081d8b0b