am 9a54d7dd: Merge change Ibbf945f3 into eclair

Merge commit '9a54d7dddcbc982d644c627693dc39fb2cb5c0fb' into eclair-mr2

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