Merge "ASoC: msm8974: remove duplicate definitions and rearrange code"