jf: WiFI is still a module

Change-Id: Ifcce768dae9febffa0a34bee078fb3d6aa2bc6c0
Merge branch 'cm-11.0' into martincz