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

Change-Id: I6a16b94a2724508b483f2ea9a90496f9bae0bd55