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

Change-Id: I95d8b3b0725adf55aab2e7882b8032f6fe441071