Merge change Ica8c305a into eclair

* changes:
  More GLSurfaceView cleanup.