Media codecs update

Change-Id: I3b0fcdde21b1da8b0dc31e1c52cbc46168fa0766
Merge "Media codecs update" into cm-11.0