Merge "Only Windows has strnlen_s." am: 6d40724402 am: a0e2e2b4be am: 294fcf964c
authorElliott Hughes <enh@google.com>
Thu, 13 Oct 2016 15:12:53 +0000 (15:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 15:12:53 +0000 (15:12 +0000)
am: da2bd89612

Change-Id: Iee7928e43606c8c4a1a1d25a354bc460a68769d0


Trivial merge