Merge changes Ifc63c2cf,I688b711e into msm-3.4

* changes:
  defconfig: msm8960: Enable HCIUART for AR3002 support
  msm: 8960: Add AR3002 Bluetooth Support