Merge "codec2: fix C2Buffer"