Merge "ART: Fix test dependencies and code"
am: dd385679eb

Change-Id: Ib46a370dbd52ba331dbcdd0140a0efad5bc58834