Merge "Revert^4 "Make class redefinition work with native methods on stack."" am: 25057337dc am: 48e047afe2
am: 628e4786d8

Change-Id: Iabbb58a9b7498b9aafcc0a04d0f98332163bf0c8