Update board-vigor.c
Conflicts:

	arch/arm/mach-msm/board-vigor.c
USB: gadget: use CAF android gadget at M8260AAABQNLZA30170

Conflicts:
	drivers/char/diag/diagchar_core.c
	drivers/char/diag/diagfwd.c
	drivers/usb/gadget/Kconfig
	drivers/usb/gadget/android.c
	drivers/usb/gadget/ci13xxx_udc.c
	drivers/usb/gadget/composite.c
	drivers/usb/gadget/f_adb.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/gadget/f_rmnet_sdio.c
	drivers/usb/gadget/f_rmnet_smd_sdio.c
	drivers/usb/gadget/f_serial.c
	drivers/usb/gadget/u_ether.c

Change-Id: I67b3945aa74ba09fd8a99962c718de5713b44f5d
msm: vigor: bulk update USB gadget CAF

Change-Id: I05998d85acb0e9c2729da1a7dbbec38da035bbd3
bluetooth: updating bluetooth driver to caf

Change-Id: I916039b3405324ef3efe1ebbd24238b9da11e364