Merge pull request #8905 from JosJuice/jni-encoding Android: Use correct encoding when converting strings