More Charset test fixes.

Bug: 10210999

(cherry picked from commit c44b103bfd1a79762811d2125e9b94ce37300a44)

Change-Id: If28d9e2eb3d1d148863f0a08c1e17371918fcaa2
3 files changed