Squash 4.3 changes.

Conflicts:
	bcm4329/Android.mk
	bcmdhd/config/config-bcm.mk
	bcmdhd/firmware/bcm4324/fw_bcm4324.bin

Change-Id: I2983644139c02b1210ceb66d73024d2421493d19