Merge "jni: fix C99 inline linking"