Merge "USB: allow match on bInterfaceNumber"