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