media_codecs: align to CM

Change-Id: Id72e02f557e59469208cc704e545dfd47650971f