Merge "Revert "fix argument mismatches in Paint JNI"" into jb-mr2-dev