Merge "Fix benign overflows in ACodec"