Merge "jni: remove obsolete flag from makefile"