Merge "ARM: mm: fix MMU mapping of CMA regions"