sm8250-common: Switch to AOSP NfcNci

Change-Id: I3403084373445475ee1d997c47cfaa887bcfeb4a

common.mk

@@ -374,17 +374,12 @@ PRODUCT_PACKAGES += \
 
 # NFC
 PRODUCT_PACKAGES += \
-    android.hardware.nfc@1.0:64 \
-    android.hardware.nfc@1.1:64 \
-    android.hardware.nfc@1.2:64 \
     android.hardware.nfc@1.2.vendor \
-    android.hardware.secure_element@1.0:64 \
     android.hardware.secure_element@1.2.vendor \
     com.android.nfc_extras \
+    NfcNci \
     SecureElement \
-    Tag \
-    vendor.nxp.nxpese@1.0:64 \
-    vendor.nxp.nxpnfc@1.0:64
+    Tag
 
 # OMX
 PRODUCT_PACKAGES += \

proprietary-files.txt

@@ -663,12 +663,6 @@ vendor/lib64/unnhal-acc-hta.so
 vendor/lib64/unnhal-acc-hvx.so
 
 # NFC
-system/etc/nfcee_access.xml
--system_ext/app/NQNfcNci/NQNfcNci.apk;OVERRIDES=NfcNci
-system_ext/etc/permissions/com.nxp.nfc.nq.xml
-system_ext/framework/com.nxp.nfc.nq.jar
-system_ext/lib64/libnqnfc-nci.so
-system_ext/lib64/libnqnfc_nci_jni.so
 vendor/bin/hw/vendor.nxp.hardware.nfc@2.0-service
 vendor/etc/init/vendor.nxp.hardware.nfc@2.0-service.rc
 vendor/etc/permissions/com.nxp.mifare.xml