Revert "jf: add support for variant defconfigs"

Conflicts:
	scripts/kconfig/conf.c

Change-Id: I24069eaddee60f8a7b5d8a8f69a25eed5d632833
jf: regen defconfig

Change-Id: Ib78f517d2a510704ba2e2570644cd09aa79a40f4