Merge "Fix run-jdwp-tests.sh when running against RI."