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

Change-Id: Ia0875fce89499cc3168904369d5d39d87b03b42d