am: b0dee92d * commit 'b0dee92d': ART: Refactor imgdiag internals Change-Id: Ie6237245f3d88778127e1b97925a61e57c9bd2c4