am db7ab295: Merge change 23258 into eclair

Merge commit 'db7ab295c4d6e9b03ea3149ad015699f63221087'

* commit 'db7ab295c4d6e9b03ea3149ad015699f63221087':
  Add the ability to turn on proguard for java targets, and to call aapt