Android m preview 1
Merge "bionic has strlcat and strlcpy."