Merge "Remove utf32 functions." am: 4e6275ddaf
am: 68bb9b4c3d

Change-Id: I7125d38088221d317dc23d223cebf105e95b68e3