Merge "CCodec: use null wrapper instead of empty buffer" into sc-dev