Update defconfigs with latest merged devices

Prevent build breakage