Merge "Fix shared version of libcutils on the host to include strlcpy"