Merge "Revert "Revert "Revert "Make class redefinition work with native methods on stack.""""