am 22b45d87: (-s ours) am f6557862: Force memory unwinds to use a zero map offset.

* commit '22b45d87403367e5e0cd223bd68eb11e343e13e0':