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

Change-Id: Ib91c75a4e6370d15ab639d96d8a594c5fa8b187a