zenfone7: Build Fingerprint 2.1 HAL from source

Change-Id: Ia80315b03c9838b8c576e7503153759bb52b17f3
diff --git a/device.mk b/device.mk
index c1bc608..e65effe 100755
--- a/device.mk
+++ b/device.mk
@@ -50,6 +50,10 @@
 PRODUCT_PACKAGES += \
     CameraTile
 
+# Fingerprint
+PRODUCT_PACKAGES += \
+    android.hardware.biometrics.fingerprint@2.1-service
+
 # Input
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/idc/fts_ts.idc:system/usr/idc/fts_ts.idc \
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index e6d380b..8e63991 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -107,7 +107,6 @@
 vendor/bin/hdcp2p2prov
 vendor/bin/hvdcp_opti
 vendor/bin/hw/android.hardware.authsecret@1.0-service-qti
-vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service
 vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
 vendor/bin/hw/android.hardware.boot@1.1-service
 vendor/bin/hw/android.hardware.camera.provider@2.4-service_64
@@ -380,7 +379,6 @@
 vendor/etc/gpt_both0_16GB.bin
 vendor/etc/init.qti.fm.sh
 vendor/etc/init/android.hardware.authsecret@1.0-service-qti.rc
-vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service.rc
 vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
 vendor/etc/init/android.hardware.boot@1.1-service.rc
 vendor/etc/init/android.hardware.camera.provider@2.4-service_64.rc
@@ -1040,7 +1038,6 @@
 vendor/etc/system_properties.xml
 vendor/etc/thermal-engine.conf
 vendor/etc/usb_audio_policy_configuration.xml
--vendor/etc/vintf/manifest/android.hardware.biometrics.fingerprint@2.1-service.xml
 -vendor/etc/vintf/manifest/android.hardware.boot@1.1.xml
 -vendor/etc/vintf/manifest/android.hardware.cas@1.2-service.xml
 -vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml
diff --git a/regen-vendor.sh b/regen-vendor.sh
index 454a416..59029e1 100755
--- a/regen-vendor.sh
+++ b/regen-vendor.sh
@@ -498,6 +498,11 @@
     "etc/init/android.hardware.drm@1.3-service.clearkey.rc"
     "etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.clearkey.xml"
 
+    # Fingerprint
+    "bin/hw/android.hardware.biometrics.fingerprint@2.1-service"
+    "etc/init/android.hardware.biometrics.fingerprint@2.1-service.rc"
+    "etc/vintf/manifest/android.hardware.biometrics.fingerprint@2.1-service.xml"
+
     # Health
     "bin/hw/android.hardware.health@2.1-service"
     "etc/init/android.hardware.health@2.1-service.rc"
@@ -874,7 +879,6 @@
 
 presign "app/com.qualcomm.qti.gpudrivers.lahaina.api30/com.qualcomm.qti.gpudrivers.lahaina.api30.apk"
 
-as_module "etc/vintf/manifest/android.hardware.biometrics.fingerprint@2.1-service.xml"
 as_module "etc/vintf/manifest/android.hardware.boot@1.1.xml"
 as_module "etc/vintf/manifest/android.hardware.cas@1.2-service.xml"
 as_module "etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml"