Fold alpha to the draw in savelayer-draw-restore patterns with non-opaque draw

tests/RecordOptsTest.cpp

Index: tests/RecordOptsTest.cpp
diff --git a/tests/RecordOptsTest.cpp b/tests/RecordOptsTest.cpp
index dd5035b216b66e52f156d4e117f0b9943f8913bc..34725e18a691f251f8d32f703e14ceae1c99742d 100644
--- a/tests/RecordOptsTest.cpp
+++ b/tests/RecordOptsTest.cpp
@@ -155,11 +155,11 @@ DEF_TEST(RecordOpts_NoopSaveLayerDrawRestore, r) {
     recorder.restore();
     assert_savelayer_restore(r, &record, 9, false);
 
-    // No change: draw paint isn't opaque.
+    // SaveLayer/Restore removed: we can fold in the alpha!
     recorder.saveLayer(NULL, &goodLayerPaint);
         recorder.drawRect(draw, badDrawPaint);
     recorder.restore();
-    assert_savelayer_restore(r, &record, 12, false);
+    assert_savelayer_restore(r, &record, 12, true);
 
     // SaveLayer/Restore removed: we can fold in the alpha!
     recorder.saveLayer(NULL, &goodLayerPaint);