Revert "usb gadget: use two luns on devices with two cards"

This reverts commit b5e8c63f7e110e7bdd2c7866cabc9cf69c48f36f.