Merge "msm: Disable Dynamic memory management" into msm-3.0