Revert "pull in usb stuff from m7"

This reverts commit 5b1716215e01550f6c0438a95296b0b10d9f8e96.