Merge "codec2: fix {linear|graphic}Blocks() references" into pi-dev
am: d793957b0b

Change-Id: I6738a02ddc38840e3fc7a5d1d8fcde3cfbc1da55