root: Clean up init.usb, etc

Change-Id: Ibd22f6e785ba39db74ddf4ff62723eb1e36a7c21
Merge remote-tracking branches 'rqdev/cm-10.1' and 'rqkang/cm-10.1' into cm-10.1