Locale support using libiconv and libicu, cosmetic improvements

Also support for NDK r10b