Merge "Fix dex file reading in VdexFile::GetNextDexFileData." am: abafaf8383
am: 5a210d499b

Change-Id: I89a072ed60488e1bbb3bcacb59c611eaa770f449