Merge "msm: board8660: Allocate proper size to MM_FW heap" into msm-3.4