Merge "Revert "Verify profile wrt dex file in dex2oat""
am: b92384853a

Change-Id: I8352ad377a0d5090a9250f1527fa6cf142ede9f1