Merge "ART: Refactor imgdiag internals"
am: c52e3f9

* commit 'c52e3f9e300d5c3f30f13a7812f0ff7aa8d9a4b1':
  ART: Refactor imgdiag internals

Change-Id: I32cf0bcb4f4431562c32e510930e2b76dd738d80