am 062bd465: Merge "jni: fix C99 inline linking"

* commit '062bd465cd25806ea37200639c6b1200a62db9d4':
  jni: fix C99 inline linking