Merge "Revert "Revert "Rewrite ImageWriter's merging of String char[]s."""