Merge change Ibbf945f3 into eclair

* changes:
  fix [2236832] software OpenGL ES driver doesn't work on sholes
tree: aee28b171b44bad968e739cd2252e00bae0bd99e
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE