Merge "Adjust DEX file reading to follow layout changes in ART."
am: 8fbdbba9f5

Change-Id: I550ee4892c6c9ec83695ea861af9953fdb5c53fb