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