Codec2: more adjustments for C2Work related changes

Bug: 64121714
Change-Id: Ia0365b0b0087d9304b04a1f0e53edc091873c6e5
4 files changed