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