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