Fixed compile error in usb and cleaning

Change-Id: If9d7ec15c9b3ae466a85344f030f46bb5cd3eae7