Merge "Codec2: add c2_cntr32_t and c2_ctnr64_t types"