am 8e357bf5: Merge "Fix clang warnings in core/jni."

* commit '8e357bf54173c3f83584c10983392f0d87e0b2b3':
  Fix clang warnings in core/jni.