Merge "test/android/Android.mk: fix build w/ENABLE_SHARED=0"
authorJames Zern <jzern@google.com>
Wed, 10 Jun 2015 19:22:41 +0000 (19:22 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 10 Jun 2015 19:22:42 +0000 (19:22 +0000)

Trivial merge