Revert "raven: Replace NFC app with NFC apex"

Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056

Bug: 309117462
Change-Id: I9298ad5be151b96e3b77301490feb8aaee3231b1
Test: Compiles, device boots up

Author: rpius

device-oriole.mk

@@ -146,7 +146,7 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	com.android.nfcservices \
+	NfcNci \
 	Tag \
 	android.hardware.nfc-service.st \
 	NfcOverlayOriole

device-raven.mk

@@ -152,7 +152,7 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/nfc/libnfc-nci-raven.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	com.android.nfcservices \
+	NfcNci \
 	Tag \
 	android.hardware.nfc-service.st \
 	NfcOverlayRaven

device-slider.mk

@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	com.android.nfcservices \
+	NfcNci \
 	Tag \
 	android.hardware.nfc-service.st
 

device-whitefin.mk

@@ -79,7 +79,7 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	com.android.nfcservices \
+	NfcNci \
 	Tag \
 	android.hardware.nfc-service.st