Fix warm reboots that cause "JDWP" to tombstone.

This reverts commit 99ac88af7d0b1a6dd4900b37c0b872c28a5789cd
Merge "Fix warm reboots that cause "JDWP" to tombstone." into jb42