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

Change-Id: I520b29f7e9eeb571c3220d76de12cc5c52fa9be7