Revert "A rough cleanup of netd/softap"

This reverts commit 25753d500d9ef6ee04dad43ffa27287a6dc959ac.

Conflicts:
	SoftapController.cpp

Conflicts:
	SoftapController.cpp

Change-Id: I3f5be33c642c330b19792ed7e7e427dc6544ce62