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