Merge 32905e63d5e3ddc613b7a21c45eaf2e1d42ebf41 on remote branch

Change-Id: I77e3836e139a9456de4ec85d6b5a06383277b839
diff --git a/Kbuild b/Kbuild
index 1380e71..bb4beed 100644
--- a/Kbuild
+++ b/Kbuild
@@ -106,9 +106,9 @@
 endif # ANDROID_BUILD_TOP
 else
 ifneq ($(ANDROID_BUILD_TOP),)
-    WLAN_BLD_DIR := $(ANDROID_BUILD_TOP)/device/qcom/msm8909w/opensource/wlan
+    WLAN_BLD_DIR := $(ANDROID_BUILD_TOP)/device/qcom/sdm429w/opensource/wlan
 else
-    WLAN_BLD_DIR := device/qcom/msm8909w/opensource/wlan
+    WLAN_BLD_DIR := $(BOARD_OPENSOURCE_DIR)/wlan
 endif # ANDROID_BUILD_TOP
 endif # TARGET_SUPPORTS_WEARABLES
 endif # WLAN_PROPRIETARY