Merge change 482 into donut

* changes:
  location: Location Manager wakelock cleanup, phase 2
tree: 81511e8958097836ceaee1fb1f18bae55d5ebb5c
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE