Merge "codec2: fix {linear|graphic}Blocks() references"