Merge "Fix deStrnlen fall-back implementation" into nougat-cts-dev am: a04db6628e...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 18:39:38 +0000 (18:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:39:38 +0000 (18:39 +0000)
am: 0621c907c0

Change-Id: If0bcb212097a0be4a9ef8b30cd3aa9d94098df99


Trivial merge