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

Change-Id: Ide057888f880be35be98f7aaee819dbffb8338e6