Merge "Revert "Revert "Make class redefinition work with native methods on stack."""
am: 6e4576f0f4

Change-Id: I43a8f5ec5afd27548652dfeb8a2bee1d405c868b