Merge "Codec2: adjustments due to C2Allocator changes"