Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb