Merge "msm: 8x25: Increase the PMEM_ADSP size" into msm-3.4