Merge "ART: Fixup JDWP tests script"