Deprecate allocator 4.0 in favor of AIDL V1

Bug: 220910504
Bug: 228405226
Fix: 233412845
Test: go/allocator4-deprecate
Change-Id: Ie6826b539fb1c780f4860acce440765ee3f99517
diff --git a/device.mk b/device.mk
index 3a85217..6cb0b3b 100644
--- a/device.mk
+++ b/device.mk
@@ -506,8 +506,6 @@
 # for now include gralloc here. should come from hardware/google_devices/exynos5
 PRODUCT_PACKAGES += \
 	android.hardware.graphics.mapper@4.0-impl \
-	android.hardware.graphics.allocator@4.0-service \
-	android.hardware.graphics.allocator@4.0-impl \
 	android.hardware.graphics.allocator-V1-service
 
 PRODUCT_PACKAGES += \
diff --git a/manifest.xml b/manifest.xml
index 1d59695..1cb5345 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -40,15 +40,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IAllocator</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
         <version>4.0</version>
diff --git a/manifest_64.xml b/manifest_64.xml
index d1bc155..09466c9 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -27,15 +27,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IAllocator</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
         <version>4.0</version>