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

Change-Id: I5a88e67ce7caf125069845c44b62712343987e1e