Android CTS 6.0 Release 20 (4120755)
Merge "bionic has strlcat and strlcpy."