Merge "Make class redefinition work with native methods on stack."