am 43429036: am 91216a7e: Merge "Fix deadlock when switching between two GLSurfaceViews" into gingerbread

Merge commit '43429036f5885063e522603e51c5f59f8b9e697a'

* commit '43429036f5885063e522603e51c5f59f8b9e697a':
  Fix deadlock when switching between two GLSurfaceViews