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

Change-Id: I470308983ab3fb7bd7dabf33655442e6efda055d