Merge "ART: Change no-image run-test dependency"