Merge "Avoid null pointer dereference when sending JDWP packets"