defconfig: fix up s87cm_d2_defconfig to mirror cyanogen_d2_defconfig, plus my changes