gta4xl-common: Migrate to Health 2.1 HAL

Change-Id: Ic6302844ac58c16713b43b6871a705b9b4749a96
diff --git a/manifest.xml b/manifest.xml
index 17394e1..e48a66f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -132,18 +132,6 @@
         <fqname>@2.1::IMapper/default</fqname>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>IHealth</name>
-            <instance>default</instance>
-            <instance>sehhealth</instance>
-        </interface>
-        <fqname>@2.0::IHealth/default</fqname>
-        <fqname>@2.0::IHealth/sehhealth</fqname>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
         <version>4.0</version>
diff --git a/platform/product_packages.mk b/platform/product_packages.mk
index ec860c3..52468c1 100644
--- a/platform/product_packages.mk
+++ b/platform/product_packages.mk
@@ -70,8 +70,8 @@
 
 ### HEALTH
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.0-impl \
-    android.hardware.health@2.0-service
+    android.hardware.health@2.1-impl:64 \
+    android.hardware.health@2.1-service
 
 ### HIDL
 PRODUCT_PACKAGES += \