Merge "ART: Fix target test paths"