Android CTS 6.0 Release 4
Merge "bionic has strlcat and strlcpy."