Merge "mm: Use correct define for CMA features"