Merge change Ie4cdb5a3 into eclair

* changes:
  Add --custom-package to aapt