Merge changes Ib33f409a,I567d3ea9 into msm-3.0

* changes:
  defconfig: msm8960: Enable circuit-switched video telephony host driver
  usb: serial: Add support for circuit-switched video telephony driver