[usb] merge in some changes from another code base to make the usb
string manipulation a little simpler
4 files changed