sound/soc/qdsp6v2: Merge s3ve3g changes