Merge changes If9b57167,Id088ae9d into msm-3.0

* changes:
  Revert "Merge "Revert "ASoC: msm8960: Add module MBHC..."" into msm-3.0"
  Revert "Merge "Revert "ASoC: wcd9310: Fix headset detect..."" into msm-3.0"