Cleanup: Fix entries for wifi and BT

We have references to 3.18 wifi module related files
which are no more present. Fixed reference to BT files
as well.

Issue: https://bugs.96boards.org/show_bug.cgi?id=310

Change-Id: I519fbdb17c632f5060f56c673834c619ec1717e2
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
diff --git a/device.mk b/device.mk
index 0729249..70c777b 100644
--- a/device.mk
+++ b/device.mk
@@ -35,8 +35,6 @@
 			$(LOCAL_PATH)/ueventd.hikey.rc:root/ueventd.hikey.rc \
 			$(LOCAL_PATH)/hikey.kl:system/usr/keylayout/hikey.kl
 
-$(call inherit-product-if-exists, device/linaro/hikey-kernel/modules/wifi/wifi.mk)
-
 # Set custom settings
 DEVICE_PACKAGE_OVERLAYS := device/linaro/hikey/overlay
 
@@ -84,7 +82,7 @@
 $(call inherit-product-if-exists, vendor/linaro/hikey/device-vendor.mk)
 
 # Include BT modules
-$(call inherit-product-if-exists, devices/linaro/hikey/wpan/ti-wpan-products.mk)
+$(call inherit-product-if-exists, device/linaro/hikey/wpan/ti-wpan-products.mk)
 
 PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \