Merge changes If06f1da2,Iad717bc7 into msm-3.0

* changes:
  ASoC: msm8930: Fix incorrect configuration for analog mic
  ASoC: WCD9304: Add support for Active Noise Cancellation