Merge changes I9b4acae8,Ic0e2a529,Ib37f8545 into msm-3.0

* changes:
  ASoC: wcd9310: Use calibrated threshold
  ASoC: wcd9310: Introduce MBHC multi button support
  ALSA: Define more sound jack types