Merge "Codec2: fix miscellaneous typos"