Merge "Fix JDWP tests in CTS" into oreo-mr1-cts-dev am: 9e98543dbc
am: 7f72631517

Change-Id: I7edbb7373446fc9167a667041a134d73cb0dedd5