Merge "media/codec2: move HDR10PlusMetadata to image/video section"