Merge "Revert "Revert^4 "Make class redefinition work with native methods on stack."""
am: 86bbe45677

Change-Id: I3632fcbe267b6c7eef456e2adaabc7170350c42c