Merge "Revert^4 "Make class redefinition work with native methods on stack."" am: 25057337dc
am: 48e047afe2

Change-Id: Iba66c90cca16679a8cb4cd0d19fe963baf12f73d