Merge "Revert "Do not do local unwinds through .oat or .dex maps.""