Revert "d2: add support for variant defconfigs"

This reverts commit d1971fc8dbd611639ad91859ead9a3e761aeb848.

revert.
Revert "defconfigs: fix up for selinux dependencies"

This reverts commit da008d99ecf1536ffcf41f9212f1a9008cb4af5e.

revert
Merge remote-tracking branch 'origin/jb-test' into jb-test

revert