codec2 build errors fixed.
More codec2 build errors fixed.
Merge branch 'c2bug'