Merge "Add some helpful features to jdwp test runners"
am: b85c4a368c

Change-Id: I2003286d2e8ea099459aaaa01684eebd958e372a