Merge "ART: Refactor imgdiag internals" am: c52e3f9 am: a35bde7
am: b0dee92

* commit 'b0dee92d7e066df1528b9cd154207f6b9b99444e':
  ART: Refactor imgdiag internals

Change-Id: Ie6237245f3d88778127e1b97925a61e57c9bd2c4