Merge "ART: Fix test dependencies"
am: 89d4248320

Change-Id: I6531b55648c269907c8f8824464f2e9ce8c338aa