Small cleanup
s2: fix wifi

Change-Id: Icd22ad92e4b1e0e50326e9c5edd302dee1dab401

https://gerrit.omnirom.org/#/c/5688/
fix wipe 2ndROM data/cache
fix mke4fs