Merge changes Ie9344aad,I8f005627 into msm-3.0

* changes:
  usb: msm_otg: Migrate to clock apis for XO voting
  msm: clock-8960: Remove virtio workaround