Merge "Fix generic JNI stubs to not discard the Java native frame."