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

Change-Id: I369b5b3b8380bc2bf08197256df4a99e21c49d40