Merge "ASoC: msm8960: Fix button detection voltage thresholds" into msm-3.4