Merge "Revert "ASoC: msm: qdsp6v2: disable OCMEM by default""