am b04f8cdc: am decdbd79: (-s ours) Merge change I5e98e6f0 into eclair

Merge commit 'b04f8cdccf01132c7c14df1fed1f39c9dbb752c6' into eclair-mr2-plus-aosp

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