am 1e862370: Merge "ART: Add imgdiag_test test dependency"

* commit '1e862370ff2c3207afd1b2fc6f77f7ca345643b2':
  ART: Add imgdiag_test test dependency