Merge "ASoC: msm8930: Enable external speaker power amps" into msm-3.0