Merge "Remove two more unused utf32 functions."
am: d7546f1d57

Change-Id: Iae9dda4eefa267e1314003a9ea3f6aa7d85b6e6c