Merge "ASoc: msm: Multi channel AAC clips don't play" into msm-3.0