Merge "Revert "msm: board-msm7627a-audio: create separate board file for audio"" into msm-3.0