3885103
wifi-util: cleanup header inclusion (cherry picked from commit a5330078158cbd5070e42fd3f91ecb570e210359)