Merge outline paint phases into the foreground phase.

sky/tests/framework/citylist-scrolled-expected.txt

Index: sky/tests/framework/citylist-scrolled-expected.txt
diff --git a/sky/tests/framework/citylist-scrolled-expected.txt b/sky/tests/framework/citylist-scrolled-expected.txt
index 7f4b1e1740b039e6066712c9122ead3674d225a2..f46c995c5693f7f19d54104255a8674e35e27449 100644
--- a/sky/tests/framework/citylist-scrolled-expected.txt
+++ b/sky/tests/framework/citylist-scrolled-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 1400 scrollHeight 2400
   RenderBlock (positioned) {div} at (0,0) size 800x600
-layer at (0,-1400) size 800x2400 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
+layer at (0,-1400) size 800x2400 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
   RenderBlock {div} at (0,0) size 800x2400
 layer at (0,400) size 800x27
   RenderBlock (positioned) {state-header} at (0,0) size 800x27
@@ -134,7 +134,7 @@ layer at (0,370) size 800x28 clip at (0,370) size 800x27
       RenderInline {span} at (0,0) size 107x15 [color=#AAAAAA]
         RenderText {#text} at (64,0) size 107x15
           text run at (64,0) width 107: "population 9806"
-layer at (0,-2) size 800x28 backgroundClip at (0,0) size 800x26 clip at (0,0) size 800x25 outlineClip at (0,0) size 800x600
+layer at (0,-2) size 800x28 backgroundClip at (0,0) size 800x26 clip at (0,0) size 800x25
   RenderFlexibleBox {city-item} at (0,-402) size 800x28 [border: none (1px solid #EEEEEE) none]
     RenderParagraph {div} at (12,8) size 195.73x15
       RenderInline {span} at (0,0) size 73x15
@@ -170,7 +170,7 @@ layer at (0,58) size 800x28 clip at (0,58) size 800x27
       RenderInline {span} at (0,0) size 108x15 [color=#AAAAAA]
         RenderText {#text} at (94,0) size 108x15
           text run at (94,0) width 108: "population 4823"
-layer at (0,595) size 800x28 backgroundClip at (0,595) size 800x5 clip at (0,595) size 800x5 outlineClip at (0,0) size 800x600
+layer at (0,595) size 800x28 backgroundClip at (0,595) size 800x5 clip at (0,595) size 800x5
   RenderFlexibleBox {city-item} at (0,195) size 800x28 [border: none (1px solid #EEEEEE) none]
     RenderParagraph {div} at (12,8) size 188.09x15
       RenderInline {span} at (0,0) size 66x15