Merge commit '8d0e14723312a9f8286ba95cc559ee000eab1b82' * commit '8d0e14723312a9f8286ba95cc559ee000eab1b82': More GLSurfaceView cleanup.
Merge commit '8d0e14723312a9f8286ba95cc559ee000eab1b82' * commit '8d0e14723312a9f8286ba95cc559ee000eab1b82': More GLSurfaceView cleanup.