Merge "defconfig: msm: Remove codec specific config for core"