Merge changes Ibe383c05,I1b8fa1c9 into msm-3.0

* changes:
  msm: board-apq8064: Add USB support
  USB: gadget: android: Add NULL check for platform data of android_dev