am aa1abe87: (-s ours) Make ApkBuilder create filenames supported by older rules.

Merge commit 'aa1abe879a53e1d25b8a95f677a920938097f3c9' into eclair

* commit 'aa1abe879a53e1d25b8a95f677a920938097f3c9':
  Make ApkBuilder create filenames supported by older rules.