Apply generating wpa_supplicant.conf on the fly

Change-Id: Id9a8837dc60a13b92c92ca283ffd1b6bcc57ce40
http://b/issue?id=1800203
Include correct wpa_supplicant.conf with different WPA_SUPPLICANT_VERSION

Change-Id: I1e0ef0634803fd35291b6bd291a563c83cbb5783
Merge commit 'e488f7f82b784cb3bd8cf92806ce84002d03fe00' into HEAD

* commit 'e488f7f82b784cb3bd8cf92806ce84002d03fe00':
  Include correct wpa_supplicant.conf with different WPA_SUPPLICANT_VERSION
  Apply generating wpa_supplicant.conf on the fly
Add support for bcm4330 wlan device

Change-Id: I550a0310d91197e28313b75b3ce9036a3b0620c0
bcm4330: Sync with 2.3.4 kernel sources

Change-Id: I7f6b97e2fdb072a196deea6a747d9b44edcf3774
Remove user tag

Conflicts:
	bcm4329/config/Android.mk