Merge change I37c4157d into eclair

* changes:
  add "junk path" -k option to aapt (DO NOT MERGE)
tree: 1d474a821f03995ad045f4689acd1acd2dd0856b
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE