Fix warm reboots that cause "JDWP" to tombstone

Change-Id: Ice655c7b1515a464ca6b24cb5acf6c52857b26b2