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

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