Merge "Add media_codecs"
am: 5ee0559601

Change-Id: I1d7f8167a12fbbc9b02d0a631c80bec8e7b1a103