Merge "Add extra options to tools/run-jdwp-tests.sh"