am 6ebf4436: Merge change I04432db5 into eclair-mr2

Merge commit '6ebf443631025b132f644bd349258192db4e3e9c'

* commit '6ebf443631025b132f644bd349258192db4e3e9c':
  use aapt to build jar files instead of the system zip