Update JNI solution