Merge change I903ce7b1 into eclair-mr2

* changes:
  Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.