Merge "Fix strstr16." into nyc-dev am: a34a383607
am: a12fb416d7

* commit 'a12fb416d7b2105f3a7fd9ae78cf98eaf183092d':
  Fix strstr16.

Change-Id: I6776ce521daf4b45f22c55dbee714f2abe8c599e