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

* commit 'a34a383607007d632878929c6c9278221242d457':
  Fix strstr16.

Change-Id: Ia41d8da5d627ac1e28f2fe7b02c7e9a740727556