Revert "A rough cleanup of netd/softap"

This reverts commit 25753d500d9ef6ee04dad43ffa27287a6dc959ac.

Conflicts:

	SoftapController.cpp
	SoftapController.h

Change-Id: Ia7c90c42c3926a2a26137e6af8fe59f54f2aad52