Merge "Revert "ASoC: msm8960: Add module MBHC module parameters"" into msm-3.0