Merge "Verify profile wrt dex file in dex2oat"
am: ac7f970bdb

Change-Id: I7d7b34883202b50b50c47a87d94ad955bdfa8d4f