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

* commit '45ae15f9002cdd9117ac10079b112b987dc43717':
  Fix Windows strlcpy.c build.