Merge changes Iccd3819c,If5856ead into msm-3.0

* changes:
  ASoC: msm8960: add headphone over current protection type
  ASoC: wcd9310: add headphone over current protection feature