am 49c381af: am 8e192f62: Merge "Fix Windows strlcpy.c build."

* commit '49c381af1af3ceb52615416a4a7faede669f0d70':
  Fix Windows strlcpy.c build.