Merge "Add media_codecs" am: 5ee0559601
am: 380fa81a16

Change-Id: I4ae91d9dfe145d446cac4ae6104b3a87fb994443