Merge "Support running jdwp tests on RI and with alternate JDWP"
am: 95d9bdd36b

Change-Id: I9ec4bc91cdf03298b3442c478d58b03b03b09c6a