Merge changes I1ab9ec9f,I0fe01760

* changes:
  Revert^2 "OatFileAssistant: look at vdex file for IsDexOptNeeded"
  Check vdex file is valid in VdexFile::Open.