Merge change I564b5b00 into eclair-mr2

* changes:
  add "junk path" -k option to aapt