Make sure libwifi-service is included whenever wifi-service is used. am: f3c1e41d48 am: 53194b362f
am: 3fa6f6dfd5  -s ours

Change-Id: I8ea6a915c2b189a20437a2fa1d2ebc9cba9f69f0