[scudo] Rework dieOnMapUnmapError am: 4d022f5d4f

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

Change-Id: If2e9b5f865befdba30dc6c1b7e4308eb8532c6f6