Revert "Force-use the pbuffer surface for destroy"

bug:18528859

This reverts commit b945f2313a.

Change-Id: I6915624d356cb8570471eb3a5b8921f59b58db6d

libs/hwui/renderthread/CanvasContext.cpp

@@ -60,8 +60,6 @@ CanvasContext::~CanvasContext() {
 
 void CanvasContext::destroy() {
     stopDrawing();
-    setSurface(NULL);
-    mEglManager.usePBufferSurface();
     freePrefetechedLayers();
     destroyHardwareResources();
     mAnimationContext->destroy();
@@ -69,6 +67,7 @@ void CanvasContext::destroy() {
         delete mCanvas;
         mCanvas = 0;
     }
+    setSurface(NULL);
 }
 
 void CanvasContext::setSurface(ANativeWindow* window) {