Merge "ALSA: add headphone over current switches" into msm-3.0