Merge "Fix incorrect position calculation in CharsetDecoder."