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

Change-Id: I65cfae7c42576417527c5048fabb4b4a5ebadb7e