Merge change 27212 into eclair

* changes:
  Fix the build.
tree: 2ce8bf8ab5c289935a2ac4c586ed4c8de2ffa9b8
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE