Merge change I70d0bddb into eclair-mr2

* changes:
  Revise aapt options for UTF8/16 encoding