Merge "Be more intention-revealing with libcutils' strlcpy."