Merge "libmedia: add sub resource type audio-codec and video-codec."