Merge "ALSA: jack: Update supported jack switch types" into msm-4.8