Merge "Codec2: C2Allocator and C2Block1D rework"