Merge outline paint phases into the foreground phase.

sky/tests/framework/citylist-expected.txt

Index: sky/tests/framework/citylist-expected.txt
diff --git a/sky/tests/framework/citylist-expected.txt b/sky/tests/framework/citylist-expected.txt
index 301301154e7155d8f1cfcb7d966d0392b9dd3e13..d8c279f80c1b4903b5518a04e23ce90d64236952 100644
--- a/sky/tests/framework/citylist-expected.txt
+++ b/sky/tests/framework/citylist-expected.txt
@@ -6,7 +6,7 @@ layer at (0,0) size 800x600
   RenderBlock (positioned) {city-list} at (0,0) size 800x600 [bgcolor=#FFFFFF]
 layer at (0,0) size 800x600 scrollY 600 scrollHeight 2400
   RenderBlock (positioned) {div} at (0,0) size 800x600
-layer at (0,-600) size 800x2400 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
+layer at (0,-600) size 800x2400 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
   RenderBlock {div} at (0,0) size 800x2400
 layer at (0,0) size 800x27
   RenderBlock (positioned) {state-header} at (0,0) size 800x27
@@ -28,7 +28,7 @@ layer at (0,27) size 800x20
     RenderParagraph {div} at (0,0) size 800x20 [bgcolor=#DDDDDD]
       RenderText {#text} at (12,2) size 10x14
         text run at (12,2) width 10: "A"
-layer at (0,591) size 800x28 backgroundClip at (0,591) size 800x9 clip at (0,591) size 800x9 outlineClip at (0,0) size 800x600
+layer at (0,591) size 800x28 backgroundClip at (0,591) size 800x9 clip at (0,591) size 800x9
   RenderFlexibleBox {city-item} at (0,591) size 800x28 [border: none (1px solid #EEEEEE) none]
     RenderParagraph {div} at (12,8) size 214.91x15
       RenderInline {span} at (0,0) size 92x15