Merge "ASoC: msm: qdsp6v2: delete ocmem drivers" into msm-4.8