Revert "Clean up softap interface"

This reverts commit 7e9eb7b48345af69283afa7ca58d3be0a329931b.

Conflicts:
	SoftapController.cpp

Change-Id: Ieb22f6bca8cde9ca80aff5fa1bf8efc13c29df20