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

Change-Id: I0758488c1664fc8b93d61d9f74c6be76d6101e42