Revert "rootdir: clean-up usb config"

This reverts commit 97cd4b2f4e1673c1b48c6e2644df2189f7af3602.
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0