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

Change-Id: I1e858b14106e2965a89aa5b5759c8a0832e02555