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