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

Change-Id: I25c5d81c5803b920f7e4d68cc6aebe023b439ea6