Merge change 24650 into eclair

* changes:
  Add <jarfile> tag to ApkBuilder ant task