Revert "Refactor the way we track the devserver in vm tests and kill it harder."

Looks like not all builders have psutil

This reverts commit 1e565adc53903af7f39bc992de4aa8d4a3b50b0e

Change-Id: I391fe85ba6080010d412a05098d5af3929ec09cb
Reviewed-on: https://gerrit.chromium.org/gerrit/66913
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
5 files changed