Merge "Revert "Do not do local unwinds through .oat or .dex maps."" am: 9220b98fa5
am: aea086a79a

* commit 'aea086a79a57dc668b3431fdf2c5dce52b5cd0ed':
  Revert "Do not do local unwinds through .oat or .dex maps."