Merge "Move NetBSD string routines to OpenBSD." am: e7c5954b31
am: 754cb9644f

Change-Id: If798b84179d4236565e0f864e4e7733b88c129f8