Merge "ALSA: jack: update jack types" into msm-4.8