Merge "ASoC: msm: qdsp6v2: Handles additional flac metadata"