Merge "Use different method to mark DEX PC in the interpreter's CFI." am: 89ceeeb820
am: 592fd70f5a

Change-Id: I0e76531aaa0d384ddb5fd7ebc528169ee9e590b2