Switch NFC from HIDL to AIDL

Bug: 216290344
Test: atest NfcNciInstrumentationTests
Test: atest VtsAidlHalNfcTargetTest
Change-Id: Ifde6ab418a18a10b11911cd2e8459f769587f685
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 577092e..e55b62a 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -76,10 +76,7 @@
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc@1.2-service.st
-
-DEVICE_MANIFEST_FILE += \
-	device/google/raviole/nfc/manifest_nfc.xml
+	android.hardware.nfc-service.st
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin