Switch NFC from HIDL to AIDL

Bug: 216290344
Test: atest NfcNciInstrumentationTests
Test: atest VtsAidlHalNfcTargetTest
Merged-In: Ifde6ab418a18a10b11911cd2e8459f769587f685
Change-Id: Ifde6ab418a18a10b11911cd2e8459f769587f685
diff --git a/device-raven.mk b/device-raven.mk
index b0300b3..bb42519 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -132,7 +132,7 @@
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc@1.2-service.st
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -146,7 +146,6 @@
 	device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
 
 DEVICE_MANIFEST_FILE += \
-	device/google/raviole/nfc/manifest_nfc.xml \
 	device/google/raviole/nfc/manifest_se.xml