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

Change-Id: Iad0296da012b67c46833a1bef5234cedfd89b7c9