Merge "Disable unused parameter warning for jni code"