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

* commit 'bf49422197c81578cc3c0519143714f5006e9d38':
  jni: remove obsolete flag from makefile