am c40f3ba4: am 3ee119cd: Merge "ndk: update JNIEXPORT declaration in <jni.h>"

* commit 'c40f3ba4c6dfb84a4918c8ec7c721d307fdad02b':
  ndk: update JNIEXPORT declaration in <jni.h>