m8: Clean up wifi initialization

Change-Id: Ie2d9b85d0f72132f3a77afc7cfa1a512c15bb18d

Conflicts:
	rootdir/Android.mk