Upgrade the health HAL to @2.1

Bug: 152518724
Test: boot, lshal | grep health
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I4573835040653a21dc9fdca31cefa66c3314612e
diff --git a/manifest.xml b/manifest.xml
index ce4b2bd..de9eb2e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -126,14 +126,5 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>IHealth</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <kernel target-level="5"/>
 </manifest>
diff --git a/vendor.mk b/vendor.mk
index b336e20..98e6d58 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -98,7 +98,8 @@
     android.hardware.soundtrigger@2.0-impl
 
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.0-service
+    android.hardware.health@2.1-service \
+    android.hardware.health@2.1-impl \
 
 PRODUCT_PACKAGES += \
     android.hardware.keymaster@4.0-impl \