m7-common: update wifi config

* Update from hammerhead

Change-Id: I1095f6c4b38db887f095a4321c93cb464222b674
m7-common: clean up init script

Change-Id: Ia622eb4a9867bf67c96b4cef1468d058562aeeba
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0