Merge "ASoC: msm: Support for non-DTS Q6 image" into msm-3.4