Merge "Revert "Revert "Revert "Make class redefinition work with native methods on stack.""""
am: 1f3fce2dbe

Change-Id: I8dd7427409499554497528f7c7bfd24cc431a64d