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

Change-Id: I575b302a2d34367a7428c0585dfb03929ff99d20