Merge "Fix warnings of JDWP tests"
am: d78de4cb0f

Change-Id: If0faaaf0f36096f17c899660855dc055909f8550