am 3b7a1e6d: Merge change Ic52ba78c into eclair-mr2

Merge commit '3b7a1e6d70fda4ce834034930847fe2cc75de515' into eclair-mr2-plus-aosp

* commit '3b7a1e6d70fda4ce834034930847fe2cc75de515':
  Allow multiple OpenGL contexts on systems that support them.