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

Change-Id: Ia898eaabcff431c15d46608378a81a5aa4377039