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