Merge "fix argument mismatches in Paint JNI"