Merge change I5e98e6f0 into eclair

* changes:
  use aapt to build jar files instead of the system zip (DO NOT MERGE)