fix wifi
Merge branch 'cm-12.0' of https://github.com/barracuda7/android_vendor_samsung_chagallwifi_lp

Conflicts:
	chagallwifi-vendor-blobs.mk