Merge "Better fix for unregistered JNI method"