Revert changes from e5deb97, fix space detection

The change I1df1fb392dadef8d7cafa08c074dd1634e5deb97 is not needed
because the servo change happened after the 25 branch.  Also taking
the opportunity to fix the USB devices whose names are spaces.

BUG=None
TEST=Ran it

Change-Id: If39cbe0c92eb5bcab5facb571ee49a3b3a2aeb80
Reviewed-on: https://gerrit.chromium.org/gerrit/40920
Tested-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Stanley Wong <stanleyw@chromium.org>
2 files changed