Revert "Fix Ok Google - Voice Match"

This reverts commit b1f07c0aff21f343c0318cebfc0d91af8b8f44a9.
diff --git a/overlay.mk b/overlay.mk
index 57b939a..ab351e1 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -25,10 +25,8 @@
 	HardwareOverlayPicker \
 	QtiAudio \
 	Touchscreen \
-    android.hidl.base@1.0 \
-    android.hidl.manager@1.0 \
-    HotwordEnrollmentOKGoogleHI6403 \
-    HotwordEnrollmentXGoogleHI6403
+        android.hidl.base@1.0 \
+        android.hidl.manager@1.0
 
 PRODUCT_PACKAGES += \
 	hw-fpnav-daemon