Merge "Fix deStrnlen fall-back implementation" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Wed, 19 Oct 2016 15:56:53 +0000 (15:56 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 19 Oct 2016 15:56:53 +0000 (15:56 +0000)

Trivial merge