Merge "defconfig: msm8610: Remove 8226 related configs"