s2: fix wifi

Change-Id: Icd22ad92e4b1e0e50326e9c5edd302dee1dab401
Merge remote-tracking branch 'cm/android-4.4' into android-4.4