Merge "Revert^6 "Make class redefinition work with native methods on stack."" am: 6def7024f3 am: 02f1a9afe5
am: a8def41e12

Change-Id: I00a75084051153783f8f239d8c194033062fc5bc