Merge "defconfig: 8974: remove config option for 8226"