Android 6.0.1 release 40 (MOB30G)
Merge "bionic has strlcat and strlcpy."