Merge "UsbService: Refactor USB host and device support into two separate classes"