Merge "codec2: fix CBR_FD framerate mode hook-up"