am a6fa57d2: am 8c755dfe: am c7cddffa: Merge "Fix shared version of libcutils on the host to include strlcpy"

* commit 'a6fa57d23f8a322aab22efd03689826e4a107f64':
  Fix shared version of libcutils on the host to include strlcpy