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

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