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

Change-Id: Ie1891dd55dfbb74ce60dfe756ae3691f649c1503