Merge "Revert "powerstats: timeout mechanism for AoC data provider"" into tm-dev
diff --git a/device.mk b/device.mk
index 80aae9f..7defec0 100644
--- a/device.mk
+++ b/device.mk
@@ -16,3 +16,7 @@
 
 PRODUCT_SOONG_NAMESPACES += \
 	device/google/gs-common/powerstats
+
+# Disable OMX
+PRODUCT_PROPERTY_OVERRIDES += \
+	vendor.media.omx=0