Update maxkhz
Update bluetooth to that found in codeaurora's ics-chocolate branch

Change-Id: I4174782aa7de4d60de141c96a5a9b23ea199e637

Conflicts:
	arch/arm/configs/vigor_aosp_defconfig
	include/net/bluetooth/hci_core.h
	net/bluetooth/hci_conn.c
bluetooth: updating bluetooth driver to caf

Change-Id: I4c5c6b7480f790f664ea170f1a23d832d660e556

Conflicts:
	net/bluetooth/sco.c