Merge changes I7c5e5fa6,I695f8fbe into msm-3.0

* changes:
  ASoC: apq8064: Add module MBHC module parameters
  ASoC: apq8064: Add mechanical switch headset detection support