Merge changes I2cabb2d6,Idffba143 into msm-3.0

* changes:
  ASoC: msm8960: properly protect external mclk control function
  ASoC: wcd9310: Add plug detection through mechanical switch