am 582c5b85: am 690d3435: Merge "jni: remove obsolete flag from makefile"

* commit '582c5b85c5653d93afc63b00ac1efff94d0853ab':
  jni: remove obsolete flag from makefile