Snap for 11224086 from b6504003e4e0d57668179a97ef5c1902d5093352 to mainline-tzdata5-release

Change-Id: I4e2b1d437103287d2830d896cb4de58d03c6c1ee
diff --git a/device-common.mk b/device-common.mk
index 56b2e0e..c1d1888 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -51,3 +51,7 @@
 # Set thermal warm reset
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.thermal_warmreset = true
+
+# Trigger fsck on upgrade (305658663)
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.preventative_fsck = 1
\ No newline at end of file
diff --git a/device.mk b/device.mk
index 0ba6d89..cab306b 100644
--- a/device.mk
+++ b/device.mk
@@ -270,7 +270,7 @@
 # Configure EGL blobcache
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.egl.blobcache.multifile=true \
-	ro.egl.blobcache.multifile_limit=134217728 \
+	ro.egl.blobcache.multifile_limit=33554432 \
 
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 45f14ef..70b2274 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -102,7 +102,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>com.google.edgetpu.dba</name>
-        <version>2</version>
+        <version>1</version>
         <interface>
             <name>IDevice</name>
             <instance>default</instance>