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

Change-Id: I8fec45da16e62bd08b5d2d7eb4663323244c5be5