Merge commit 'c055f173c9211b27184c56ce385df5278db4011c' * commit 'c055f173c9211b27184c56ce385df5278db4011c': Publish minor additions to GLSurfaceView API.
Merge commit 'c055f173c9211b27184c56ce385df5278db4011c' * commit 'c055f173c9211b27184c56ce385df5278db4011c': Publish minor additions to GLSurfaceView API.