Merge "Do not do local unwinds through .oat or .dex maps." am: 48d930d0a9
am: bf89fc7954

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