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

* commit 'a35bde7cf6cc9b6480569a1a9aba0a60f10a5295':
  ART: Refactor imgdiag internals

Change-Id: I2c669814dd521a2c02932bb5480e4c9f3bc3d93b