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

Change-Id: Ic7aaa9d3d249511598ccd4afb46bea75fc84e174