Android CTS 6.0 Release 25 (4485418)
Merge "bionic has strlcat and strlcpy."