d2: WiFi is still a module

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