Merge "Fix dex file reading in VdexFile::GetNextDexFileData." into oc-mr1-dev