Merge "Only Windows has strnlen_s." am: 6d40724402
authorElliott Hughes <enh@google.com>
Thu, 13 Oct 2016 14:58:32 +0000 (14:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 14:58:32 +0000 (14:58 +0000)
am: a0e2e2b4be

Change-Id: I8c26c69375bd52179067702a870b0af55251b4b4


Trivial merge