Merge "Set the deopt flag after adjusting the stack pointer." am: 718ec6e046 am: ab1991590c
am: 757d60d127

Change-Id: I089f44b60e65d37296f79b7e89e4fc7fe1ccc943