am bf62d307: am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions"

* commit 'bf62d3070c1653b79f4edcc0729b6a1a833d3ca1':
  Enable stencil clipping within clearLayerRegions

libs/hwui/OpenGLRenderer.cpp

@@ -1565,13 +1565,7 @@ void OpenGLRenderer::setupDraw(bool clearLayer) {
             setScissorFromClip();
         }
 
-        if (clearLayer) {
+        setStencilFromClip();
-            setStencilFromClip();
-        } else {
-            // While clearing layer, force disable stencil buffer, since
-            // it's invalid to stencil-clip *during* the layer clear
-            mCaches.stencil.disable();
-        }
     }
 
     mDescription.reset();