Merge change I971f6fd3 into eclair

* changes:
  Improve GLSurfaceView to avoid deadlocks and race conditions.