Merge "libutils: Fix bug in strstr16." am: b128c78aef am: 0c41d457b9
am: f50a1ccce6

Change-Id: I6c1854f994bd94631aae8e040dd62dd332a81689