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

Change-Id: Id1c7458cddc36e25ee515e4fde904fa1e1805e6c