Changes to use Android API 15 and UTF-8 encoding