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

Change-Id: I00aaa07661c37d912393443896709354c84c1d50