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

Change-Id: I4f8b55d8e88662f7c870b9b2868c5883c367772e