Merge "Fixes for Generic JNI"