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