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

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base