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

Change-Id: I817ed8b22f487854bf5a7142f1a5401e196747be


Trivial merge