Merge "Ensure layer update include the dirty rect from AVD" into nyc-mr1-dev

libs/hwui/RenderNode.cpp

@@ -422,7 +422,6 @@ void RenderNode::prepareTreeImpl(TreeInfo& info, bool functorsNeedLayer) {
         pushStagingDisplayListChanges(info);
     }
     prepareSubTree(info, childFunctorsNeedLayer, mDisplayList);
-    pushLayerUpdate(info);
 
     if (mDisplayList) {
         for (auto& vectorDrawable : mDisplayList->getVectorDrawables()) {
@@ -433,6 +432,7 @@ void RenderNode::prepareTreeImpl(TreeInfo& info, bool functorsNeedLayer) {
             vectorDrawable->setPropertyChangeWillBeConsumed(true);
         }
     }
+    pushLayerUpdate(info);
 
     info.damageAccumulator->popTransform();
 }