Update for NDK r9d

Fixes #15