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

Change-Id: I6a1d6e9628dde8e3a33ae17a018e62e2a249ec2f