Merge "ASoC: msm: qdsp6v2: Handle additional codec specific metadata" into msm-4.8