Merge "usb: gadget: Use correct include style for local headers"