am 13b648eb: am 584ace0d: Merge "Fix one and hide the other warnings from core/jni"

* commit '13b648ebff99a3fb8c26152745d294a55f8c11b7':
  Fix one and hide the other warnings from core/jni