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

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