Merge "msm: Fix reservation logic for ADSP heap"