XXX rebase:   utf8.c: Fix valid_utf8_to_uvchr