Merge branch '31-develop-performance-measurement-build' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 31-develop-performance-measurement-build