Add back couple of missing lines in media_codecs.xml

Change-Id: Ibb06ec5f90c4d82266846ed89e1c0dd93944d566
Merge branch into kk_mkt