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

* commit '044648be152a8914d68c4952dae2694dd43460da':
  jni: fix C99 inline linking