Android 6.0.1 release 46
Merge "bionic has strlcat and strlcpy."