am 1167b43c: Merge change 26317 into eclair

Merge commit '1167b43c3d1ca232c9b4e0a75343b6b3cb90f0df' into eclair-plus-aosp

* commit '1167b43c3d1ca232c9b4e0a75343b6b3cb90f0df':
  Allow GLSurfaceView clients to customize EGL Surfaces and Contexts.