Merge "Add missing #include <unicode/unistr.h> statement."