Revert "Clean up softap interface"

This reverts commit 7e9eb7b48345af69283afa7ca58d3be0a329931b.

Conflicts:

	SoftapController.cpp

Change-Id: Idad229ef7bd63b1a93126284e984c8461f711c87