Merge "usb: Remove IntDef flag when it isn't a flag"