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

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