[backfire] backport r29337 (targets: fix CONFIG_USB_STORAGE_* inconsistency)