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

Change-Id: Ib4d72a346cfcf4844d47325019558dc57a727c13