Upgrade graphics.mapper HAL from 2.0 to 2.1

Bug: 130669566
Change-Id: If5ccc0314ce2b7d3be5be0f29a865497e5943809
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index d71e4d7..d8683a2 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -190,7 +190,7 @@
     <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
-        <version>2.0</version>
+        <version>2.1</version>
         <interface>
             <name>IMapper</name>
             <instance>default</instance>
diff --git a/shared/device.mk b/shared/device.mk
index 7df0c47..dbe84dc 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -212,7 +212,7 @@
 PRODUCT_PACKAGES += \
     gralloc.minigbm \
     gralloc.cutf \
-    android.hardware.graphics.mapper@2.0-impl \
+    android.hardware.graphics.mapper@2.0-impl-2.1 \
     android.hardware.graphics.allocator@2.0-impl \
     android.hardware.graphics.allocator@2.0-service
 
diff --git a/shared/sepolicy/file_contexts b/shared/sepolicy/file_contexts
index feaffc5..d206e3c 100644
--- a/shared/sepolicy/file_contexts
+++ b/shared/sepolicy/file_contexts
@@ -49,6 +49,7 @@
 /vendor/bin/hw/android\.hardware\.authsecret@1\.0-service  u:object_r:hal_authsecret_default_exec:s0
 
 /vendor/lib(64)?/cuttlefish_auto_resources.so  u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/hw/android\.hardware\.graphics\.mapper@2\.0-impl-2\.1\.so u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/hw/gralloc.vsoc.so  u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/hw/gralloc.cutf.so  u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/libcuttlefish_fs.so  u:object_r:same_process_hal_file:s0