Merge "Codec2: C2Block2D rework"