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

Change-Id: I949cd7d6dd1eb81788eb1c3d7da01c81bc32737c