Merge change I04432db5 into eclair-mr2

* changes:
  use aapt to build jar files instead of the system zip