Merge "Don't make GLRenderer aware of GLES20Renderer"