Merge "defconfig: 8610: remove duplicate and contradictory config options"