Merge "Revert^2 "Verify profile wrt dex file in dex2oat"""
am: 478abf08c6

Change-Id: I85b96d57bf7222657814c99a9c9d318c0dab81f1