Merge "Check that dex pc is in a valid map." am: 3ff3ff1c36 am: 7d362f1eb7
am: 5dc48189ee

Change-Id: Ibbea890b2d7815e902372af8b9100af505a4d254