Merge "ART: Fix run-jdwp-tests.sh"