am 451c850f: am 15f1bfb0: Merge change I70d0bddb into eclair-mr2

Merge commit '451c850fd60aca5372810a5413636fda25d93438'

* commit '451c850fd60aca5372810a5413636fda25d93438':
  Revise aapt options for UTF8/16 encoding