Merge "Clear dex pc to avoid duplicate frames." am: 643f1e93ae
am: d25de127bf

Change-Id: Ie3c6e1cb4c8f1b2a212a2b6ea872c51a267bfe2d