Revert "A rough cleanup of netd/softap"

This reverts commit 25753d500d9ef6ee04dad43ffa27287a6dc959ac.

Conflicts:
	SoftapController.cpp