Merge "Use correct method to call JNI method with void return type" into main