Merge "Add missing #include <unicode/unistr.h> statement."
am: 80d845b8fa

Change-Id: I11bed0b4466d23e6c05e2b0646c0d3454eed1f7c