Merge "mm: add HAVE_MEMBLOCK_NODE_MAP support" into msm-3.4