Merge "Fix art-run-tests dependencies"