Merge change I2b870c71 into eclair-mr2

* changes:
  Enables x-mac-cyrillic on Android, now that this is in our version of ICU.