Merge "media: disable Codec 2.0" into qt-dev
am: f2f56c0626

Change-Id: I2657ffd184223f2b301949a1fa6f0e82a79b23ed
diff --git a/shared/device.mk b/shared/device.mk
index 3f1183e..271dde8 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -51,6 +51,10 @@
 PRODUCT_PROPERTY_OVERRIDES += \
     wlan.driver.status=ok
 
+# Cuttlefish does not support ION needed for Codec 2.0
+PRODUCT_PROPERTY_OVERRIDES += \
+    debug.stagefright.ccodec=0
+
 #
 # Packages for various cuttlefish-specific tests
 #