Merge "Update media and media-swcodec - bump base version"