Merge "codec2: fix C2Buffer" into pi-dev am: 0d3062d6e8
am: 7670fc1b3f

Change-Id: Ia71340002e88bc9c7f74ed2f8aee8b98bd3c394b