Merge change I37c4157d into eclair

* changes:
  add "junk path" -k option to aapt (DO NOT MERGE)