Android CTS 6.0 Release 30 (4844167)
Merge "bionic has strlcat and strlcpy."