hikey: Clean wifi-related settings

Change-Id: Ibec66972a34d43cd69f43f0b3a73ad7fe35438e5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/device.mk b/device.mk
index 77c7123..bda7ebf 100644
--- a/device.mk
+++ b/device.mk
@@ -39,7 +39,12 @@
 DEVICE_PACKAGE_OVERLAYS := device/linaro/hikey/overlay
 
 # Add openssh support for remote debugging and job submission
-PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh uim wpa_supplicant
+PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh uim
+
+# Add wifi-related packages
+PRODUCT_PACKAGES += libwpa_client wpa_supplicant
+PRODUCT_PROPERTY_OVERRIDES += wifi.interface=wlan0 \
+                              wifi.supplicant_scan_interval=15
 
 # Build and run only ART
 PRODUCT_RUNTIMES := runtime_libart_default