Merge "Only Windows has strnlen_s." am: 6d40724402 am: a0e2e2b4be am: 294fcf964c...
authorElliott Hughes <enh@google.com>
Tue, 22 Aug 2017 18:33:13 +0000 (18:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:33:13 +0000 (18:33 +0000)
am: cb418c345c

Change-Id: Icc2fb533a54ede2a190afd884fdebf29882d9be3


Trivial merge