Merge "ART: Clean up ordering of dex cache arrays in image files." am: 685af12dab am: 3cab2247e8
am: 5235b9584f

* commit '5235b9584f8b21127ebaf64362cab1244e4f2f68':
  ART: Clean up ordering of dex cache arrays in image files.