Merge "Revert "msm: Enable MM heap to use CMA""