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

Change-Id: I9b46f20b7e565d8c9461062215df5a03eef37f20