Merge "defconfig: msm8974: enable multiple options needed"