am decdbd79: Merge change I5e98e6f0 into eclair

Merge commit 'decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-plus-aosp

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