FP5: Switch to QTI Memtrack AIDL HAL

Change-Id: Ibcbaff02fd56fbccc3a88c01a5f46a89cb212ef5
diff --git a/device.mk b/device.mk
index 8bd1720..66e2ae2 100644
--- a/device.mk
+++ b/device.mk
@@ -125,8 +125,6 @@
 PRODUCT_PACKAGES += \
     android.hardware.graphics.mapper@3.0-impl-qti-display \
     android.hardware.graphics.mapper@4.0-impl-qti-display \
-    android.hardware.memtrack@1.0-impl \
-    android.hardware.memtrack@1.0-service \
     android.hardware.renderscript@1.0-impl \
     init.qti.display_boot.rc \
     init.qti.display_boot.sh \
@@ -135,7 +133,6 @@
     libqdMetaData \
     libsdmcore \
     libsdmutils \
-    memtrack.default \
     vendor.display.config@1.0.vendor:64 \
     vendor.display.config@2.0 \
     vendor.display.config@2.0.vendor \
@@ -145,7 +142,8 @@
     vendor.qti.hardware.display.mapper@1.1.vendor \
     vendor.qti.hardware.display.mapper@2.0.vendor \
     vendor.qti.hardware.display.mapper@3.0.vendor \
-    vendor.qti.hardware.display.mapper@4.0.vendor
+    vendor.qti.hardware.display.mapper@4.0.vendor \
+    vendor.qti.hardware.memtrack-service
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/displayconfig/display_id_4630946480328692354.xml:$(TARGET_COPY_OUT_VENDOR)/etc/displayconfig/display_id_4630946480328692354.xml
diff --git a/manifest_yupik.xml b/manifest_yupik.xml
index e8b28a5..728f033 100644
--- a/manifest_yupik.xml
+++ b/manifest_yupik.xml
@@ -47,11 +47,6 @@
         <fqname>@1.0::IOmxStore/default</fqname>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.memtrack</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::IMemtrack/default</fqname>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
         <fqname>@1.2::ISap/slot1</fqname>