Update defconfig to match cm's