am: a35bde7c * commit 'a35bde7c': ART: Refactor imgdiag internals Change-Id: I2c669814dd521a2c02932bb5480e4c9f3bc3d93b