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

Change-Id: Ib424cdf323479b6342f1da8921b56ef1ccd44bb1