qcacld-3.0: Update for converged NAN config params

Update driver to use NAN config params based converged CFG
component. Cleanup hdd config references to nan ini params.

Change-Id: I5af85d68ee53ad557e64523f7a1719e328536926
CRs-fixed: 2290360
diff --git a/Kbuild b/Kbuild
index bfd1122..ce0e1d0 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1195,6 +1195,7 @@
 		 $(NAN_CORE_DIR)/nan_api.o \
 		 $(NAN_CORE_DIR)/nan_utils.o \
 		 $(NAN_UCFG_DIR)/nan_ucfg_api.o \
+		 $(NAN_UCFG_DIR)/cfg_nan.o \
 		 $(NAN_TGT_DIR)/target_if_nan.o \
 		 $(NAN_OS_IF_DIR)/os_if_nan.o
 endif