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

Change-Id: I3f7def08addedf3a22f96fb23d222932b3f4cdeb