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

Change-Id: Iacb7921df1d10fe5c53f494bdb3c4b0c04522ee5