Merge "Add manifests for media and media.swcodec APEXs"