Merge "Fix image dependencies for test-art-host-run-test-dependencies"