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