Submodule Java-make fixes *.jni targets