am: c52e3f9e * commit 'c52e3f9e': ART: Refactor imgdiag internals Change-Id: I32cf0bcb4f4431562c32e510930e2b76dd738d80