Merge change Ibbf945f3 into eclair

* changes:
  fix [2236832] software OpenGL ES driver doesn't work on sholes