Android CTS 6.0 release 3
Merge "bionic has strlcat and strlcpy."