Merge "Add missing #include "unicode/ustring.h" statement." am: c59407500d am: 6515ea0f64
am: a32b6c8ed1

Change-Id: I576f93da74a1cf8a37451a12fd3d191348917a20