Merge "ART: Fix test dependencies and code"