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

Change-Id: I67a9c5d8420b69b324b64f0af9bfd09ea36101f4