Merge "Fix dex file reading in VdexFile::GetNextDexFileData."