Merge "defconfig: Enable Mercury decoder." into msm-3.4