Merge "Fix ndk build."
authorJohann Koenig <johannkoenig@google.com>
Fri, 8 May 2015 18:56:20 +0000 (18:56 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 8 May 2015 18:56:21 +0000 (18:56 +0000)

Trivial merge