Merge cherrypicks of [5611163] into pi-qpr1-release

Change-Id: Ie0687c2540c013a9ef7bcdb6ffa96db8227f0086
diff --git a/device.mk b/device.mk
index f0d48bb..af3537d 100644
--- a/device.mk
+++ b/device.mk
@@ -390,9 +390,7 @@
 
 PRODUCT_COPY_FILES += \
     device/google/crosshatch/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/libnfc-nci.conf \
-    device/google/crosshatch/nfc/libese-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libese-nxp.conf \
-    device/google/crosshatch/felica/loaderservice_updater_1.lss:$(TARGET_COPY_OUT_VENDOR)/etc/loaderservice_updater_1.lss \
-    device/google/crosshatch/felica/loaderservice_updater_2.lss:$(TARGET_COPY_OUT_VENDOR)/etc/loaderservice_updater_2.lss
+    device/google/crosshatch/nfc/libese-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libese-nxp.conf
 
 # TODO(b/72443662)
 PRODUCT_COPY_FILES += \