Merge "Remove two more unused utf32 functions."