Merge "ART: Add imgdiag_test test dependency"