Revert "no more hacks for hostapd"

This reverts commit df4f0ad948b89f439172ec65c5a2b58c43768fdb.
Revert "Merge remote-tracking branch 'CyanogenMod/cm-11.0' into cm-11.0"

This reverts commit df618150f65d030834268fe31309880256c3fc3d, reversing
changes made to f0787a3d80af27746351789067986227922f4b01.