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

Change-Id: I6f6f5c90d01f0d82c495168187906013a3cc0549