Use bcm4330 now. Bluetooth A2DP hack

Change-Id: I967c586b9a2f1a6fb193f22f913f8f509f92255d

BoardConfig.mk

@@ -60,6 +60,7 @@ endif
 # Bluetooth
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
+BOARD_FORCE_STATIC_A2DP := true
 
 # gps
 BOARD_USES_GPSWRAPPER := true
@@ -87,7 +88,7 @@ BOARD_FLASH_BLOCK_SIZE := 4096
 WPA_SUPPLICANT_VERSION := VER_0_6_X
 BOARD_WPA_SUPPLICANT_DRIVER := WEXT
 # galaxys2 uses bcm4330
-BOARD_WLAN_DEVICE := bcm4329
+BOARD_WLAN_DEVICE := bcm4330
 WIFI_DRIVER_MODULE_PATH     := "/lib/modules/dhd.ko"
 WIFI_DRIVER_FW_STA_PATH     := "/system/vendor/firmware/bcm4330_sta.bin"
 WIFI_DRIVER_FW_AP_PATH      := "/system/vendor/firmware/bcm4330_aps.bin"