Merge changes Iba653443,I8630b967 into msm-3.0

* changes:
  Revert "msm: board-8960: Support PMIC USB OTG switch over current protection"
  Revert "msm: board-8960: Enable PMIC USB OTG switch over current protection"