split jni in jni-jvm and jni-dvm
merge master in modules