Merge "Also add run-test dependencies to build-art-*-tests."