a71: Override AOSP nfc_nci_nxp

* Fixes:
error: build/soong/fsgen/Android.bp:31:1: module "lineage_a71_generated_vendor_image" variant "android_common" (created by module "soong_filesystem_creator" variant
 "android_common"): packaging conflict at lib64/nfc_nci_nxp.so

Change-Id: I110c88f6df47300f74fc4d22832d509e36406eab

extract-files.py

@@ -6,12 +6,19 @@
 
 from extract_utils.fixups_lib import (
     lib_fixups,
+    lib_fixup_remove,
+    lib_fixups_user_type,
 )
 from extract_utils.main import (
     ExtractUtils,
     ExtractUtilsModule,
 )
 
+lib_fixups: lib_fixups_user_type = {
+    **lib_fixups,
+    'nfc_nci_nxp': lib_fixup_remove,
+}  # fmt: skip
+
 namespace_imports = [
     'vendor/samsung/a71-common',
     'vendor/qcom/opensource/commonsys/display',

proprietary-files.txt

@@ -396,7 +396,7 @@ vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so
 vendor/bin/hw/nxp.android.hardware.nfc@1.1-service;DISABLE_CHECKELF
 vendor/etc/init/init.nfc.samsung.rc
 vendor/etc/init/nxp.android.hardware.nfc@1.1-service.rc
-vendor/lib64/nfc_nci_nxp.so;MODULE_SUFFIX=_vendor
+vendor/lib64/nfc_nci_nxp.so
 vendor/lib64/vendor.nxp.nxpnfc@1.1.so
 
 # NFC (Firmware)