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

Change-Id: I953508dad2cb355dd6357d705a9f1aeb2bfd96ca


Trivial merge