record manual merge

Merge branch 'Orange/external-renderer' of forge.3gpp.org:ivas-codec-pc/ivas-codec into shared/external-renderer-orange-updates