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

Change-Id: I938405b522a442798b77609cb5108dac93d7f53f