Android 6.0.0 release 1
Merge "bionic has strlcat and strlcpy."