Merge "media: enable Codec 2.0 by default" into qt-dev am: 6de2d24bd9
am: 1834f72aba

Change-Id: I2ad7b7fc2eef498a82a3f582f04a664ae96870de