hardware-broadcom: Fix makefile

The external/wpa_supplicant don't exists anymore, use
external/wpa_supplicant_6 instead.

Change-Id: Ie02974eeca42d701e32a6c8ff10618ff3e945a20
bcmdhd: Don't try to include a non-existant Android.mk for bcm4329

The mechanism for firmware inclusion was changed to product
inheritance and the call was removed for bcm4330, but it was left
in bcm4329 causing build errors for those using bcm4329 on bcmdhd.

To include the firmwares, include the following statement at the
end of device.mk:
$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/device-bcm.mk)
Let bcm4330 use the 4329 wext library for wpa_supplicant

Tested on p930, works fine

Change-Id: I2e038ea4f0070b76c0ec5b3a2d8baa5d325df7c6
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/broadcom/wlan into HEAD
Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/hardware/broadcom/wlan into cm-10.1

Android 4.2.2 release 1.2

# gpg: Signature made Wed 17 Apr 2013 01:00:25 PM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
dhd: add missing interface command fini

seen on Netd init (before CM banner), and also close init socket.

W/InterfaceController:
Error (Symbol not found) while searching for the interface command fini function

PS: This is not called on Wifi Toggle or AP mode switch

Change-Id: Ia19324d3a5115df8a765c6b5ca1c167a48148f7e
Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	bcm4329/Android.mk
	bcmdhd/config/config-bcm.mk

Change-Id: Ib265fc14466dc52c40db6e2b457dbba84992fb2f
Merge tag 'android-4.4_r1' into cm-11.0

Android 4.4 Release 1.0