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

Merge commit '91216a7e7406ef02d833e461d0db93ece7b2140d' into gingerbread-plus-aosp

* commit '91216a7e7406ef02d833e461d0db93ece7b2140d':
  Fix deadlock when switching between two GLSurfaceViews