Merge "Fix clang warnings in core/jni."