Merge "Revert "Make class redefinition work with native methods on stack."" am: f88b4087a8
am: 92f3fd2214

Change-Id: Ib9a498490d498112eeeeac210799fd85768d39e1