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

Change-Id: I0ebc59d03f920ad1d98a7b99ccd25d465b06b57a