Merge "Merge "Fix JDWP tests in CTS" into oreo-cts-dev am: 0e3f9bccef" into oreo-mr1-cts-dev