Revert usb/gadget to fix build error for m7wlj