Merge "defconfig: msm8960: Enable media controller config" into msm-3.0