Merge "jni: test CriticalNative with generic jni"