Merge "Correct jni declarations of input handle"