Merge "Fix image dependencies for test-art-host-run-test-dependencies" am: 3523738cbd
am: 9d3b4d4f71

Change-Id: I2c805b1e73e9f0dc32591c396cc6fc5349d2a3ed