wifi fix

Change-Id: Ia3e6b373e212654dd2b7ffff62cc84a2c8aade01

Conflicts:
	Android.mk