bug:37655083 Test: jdwp (cherry picked from commit 81cc43e7) Change-Id: I566cc66efc6e1377c53650bfca9e4ffa2ffcb533