Merge "codec2: Fix nsec to msec conversion in C2Fence"