expat_utf16 is long gone, so there is no need to fool around with
expat_utf8.

Change-Id: I0dd4a5c4d78805e98913e645cc83d2ab634bcb89