am a937b8cb: Merge "Revert all recent GLSurfaceView changes." into jb-mr2-dev

* commit 'a937b8cb333d53cbbe8c0de7fb58854b77dcb3db':
  Revert all recent GLSurfaceView changes.