Revert "A rough cleanup of netd/softap"

This reverts commit 25753d500d9ef6ee04dad43ffa27287a6dc959ac.

Conflicts:

	SoftapController.cpp

Change-Id: I195691d5b740e8b09a61448a1b25ade53cbd0cbd

Conflicts:
	SoftapController.cpp
	SoftapController.h