Merge changes Ideccb992,I86a538f1,Ieebb1fbf into cm-10.1

* changes:
  defconfigs: fix up for selinux dependencies
  d2: add support for variant defconfigs
  defconfigs: use a commonized defconfig for d2