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

Change-Id: I2657ffd184223f2b301949a1fa6f0e82a79b23ed