devon: Decommonize certain blobs after inclusion of bathena device

* Apparently Bathena device is unique and doesn't
  appear mentioned in the deconommized blobs.

Change-Id: I625ba18262e3aa1299e3f0632757be3d6de8a89f

Android.bp

@@ -5,6 +5,7 @@
 soong_namespace {
     imports: [
         "hardware/motorola",
+        "hardware/qcom-caf/wlan",
         "vendor/motorola/sm6225-common",
         "vendor/qcom/opensource/display",
     ],
@@ -3891,6 +3892,39 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
+cc_prebuilt_binary {
+    name: "cnss-daemon",
+    owner: "motorola",
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/bin/cnss-daemon",
+            ],
+            shared_libs: [
+                "libcutils",
+                "liblog",
+                "libqmi_cci",
+                "libqmi_common_so",
+                "libnl",
+                "libcld80211",
+                "libperipheral_client",
+                "libmdmdetect",
+                "libqmiservices",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_binary {
     name: "android.hardware.biometrics.fingerprint@2.1-service-ets",
     owner: "motorola",

devon-vendor.mk

@@ -3153,6 +3153,7 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/devon/proprietary/vendor/etc/st21nfc_conf_ss.txt:$(TARGET_COPY_OUT_VENDOR)/etc/st21nfc_conf_ss.txt \
     vendor/motorola/devon/proprietary/vendor/etc/thermal-engine-devon.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-devon.conf \
     vendor/motorola/devon/proprietary/vendor/etc/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf \
+    vendor/motorola/devon/proprietary/vendor/etc/vhw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/vhw.xml \
     vendor/motorola/devon/proprietary/vendor/firmware/ILITEK_FW:$(TARGET_COPY_OUT_VENDOR)/firmware/ILITEK_FW \
     vendor/motorola/devon/proprietary/vendor/firmware/NT36xxx_MP_Setting_Criteria_6056.csv:$(TARGET_COPY_OUT_VENDOR)/firmware/NT36xxx_MP_Setting_Criteria_6056.csv \
     vendor/motorola/devon/proprietary/vendor/firmware/a630_sqe.fw:$(TARGET_COPY_OUT_VENDOR)/firmware/a630_sqe.fw \
@@ -3312,6 +3313,7 @@ PRODUCT_PACKAGES += \
     libvidhance_stabilizer \
     vendor.egistecbix.hardware.fingerprint@4.0 \
     capsense_reset \
+    cnss-daemon \
     android.hardware.biometrics.fingerprint@2.1-service-ets \
     android.hardware.biometrics.fingerprint@2.1-service-fpc \
     thermal-engine