Merge change Ie806ae6f into eclair

* changes:
  Fix multi-lock ordering issues in GLSurfaceView