init: cleanup for hostapd

Change-Id: I1f95835e751f9f3a420fd86069042467881749fd
Merge branch 'cm' into HEAD