Revert "wifi:restructure mac aquisition"

This reverts commit 7311ff4738e20c8ea25518fff54d23fe8b5b74b7

Change-Id: Ib1ef66c66d6f7b4883a76eec96347cb686b0ea09