Merge "Make class redefinition work with native methods on stack."
am: 8a8c8ecca3

Change-Id: I6298f0faaff98bff6166bea3ed9642963d045f41