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

Change-Id: If88d6fe2f942ad45112f19f250b21d4703c59029