Merge "Do not do local unwinds through .oat or .dex maps." into nyc-dev
am: bb7ed0141b

* commit 'bb7ed0141b0084c1ef3496fb9fbc820563a53329':
  Do not do local unwinds through .oat or .dex maps.