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

Change-Id: I45344fe8acab728e65f0754c0ebf974264efcb13