Merge "jni.h: add missing `const`s."
am: d9105f5bd7

Change-Id: I4cba7fd4bc3c43b6d51ef1c8dd45a728c2e01531