Merge "usb: gadget: Fix ci13xxx compilation issues"