diff --git a/device.mk b/device.mk
index bd3af93f..5d17eb17 100644
--- a/device.mk
+++ b/device.mk
@@ -257,7 +257,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \
 	graphics.gpu.profiler.support=true \
-	debug.renderengine.backend=skiavkthreaded
+	debug.renderengine.backend=skiaglthreaded
 
 # GRAPHICS - GPU (end)
 # ####################
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index f07987dc..58fd38d2 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -94,6 +94,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>com.google.input</name>
+        <version>2</version>
         <interface>
             <name>ITouchContextService</name>
             <instance>default</instance>
diff --git a/manifest.xml b/manifest.xml
index 18b39116..038a3d48 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -47,6 +47,7 @@
     </hal>
     <hal format="aidl">
         <name>com.google.input</name>
+        <version>2</version>
         <interface>
             <name>ITouchContextService</name>
             <instance>default</instance>
diff --git a/manifest_64.xml b/manifest_64.xml
index 3724ed7a..122d1bb3 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -39,6 +39,7 @@
     </hal>
     <hal format="aidl">
         <name>com.google.input</name>
+        <version>2</version>
         <interface>
             <name>ITouchContextService</name>
             <instance>default</instance>