Merge "defconfig: msmzinc: Enable support for CMA"