Merge "defconfig: kona: Increase number of CMA areas"