Merge "msm: board-8660: Adjust SMI heaps for CP-2.0" into msm-3.0