am ba56915a: Merge change Ie806ae6f into eclair

Merge commit 'ba56915a71cad672baff5594dbb7c9331bf01283' into eclair-plus-aosp

* commit 'ba56915a71cad672baff5594dbb7c9331bf01283':
  Fix multi-lock ordering issues in GLSurfaceView