Merge "arm/dt: 8226: Convert MM heap to use CMA"