Merge "Ensure redefinition does not break breakpoint deoptimization"
am: 1613cd18a3

Change-Id: I1a78b2af46a935a813c4a0d32dc0507bedcd679d