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

Change-Id: I14b9e7fe63266a88001262fdfeae78efd10060ae