Merge "cma: Allow option to use strict memblock_reserved memory"