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

Change-Id: I52b3629fbc5b36d0a6b37de9e7bdef3cc0f7f885