Merge "Adjust DEX file reading to follow layout changes in ART."