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

Change-Id: I5c6dbc8825bfef6e8c79a62416c1d44c33364805