Merge "msm: ocmem: Add allocator support" into msm-3.0