Fix two SkRecord-backed layer hoisting bugs

tests/RecordReplaceDrawTest.cpp

Index: tests/RecordReplaceDrawTest.cpp
diff --git a/tests/RecordReplaceDrawTest.cpp b/tests/RecordReplaceDrawTest.cpp
index 23bf9adb5a62100ffe25b548c20dd38331fd141f..693f6681c3b3ffb3fdef4ab0e40ab930b75560dc 100644
--- a/tests/RecordReplaceDrawTest.cpp
+++ b/tests/RecordReplaceDrawTest.cpp
@@ -112,11 +112,14 @@ void test_replacements(skiatest::Reporter* r, bool useBBH) {
     SkRecorder canvas(&rerecord, kWidth, kHeight);
     GrRecordReplaceDraw(record, &canvas, bbh, &replacements, NULL/*callback*/);
 
-    REPORTER_ASSERT(r, 4 == rerecord.count());
+    REPORTER_ASSERT(r, 7 == rerecord.count());
     assert_type<SkRecords::Save>(r, rerecord, 0);
-    assert_type<SkRecords::DrawBitmapRectToRect>(r, rerecord, 1);
-    assert_type<SkRecords::DrawRect>(r, rerecord, 2);
-    assert_type<SkRecords::Restore>(r, rerecord, 3);
+    assert_type<SkRecords::Save>(r, rerecord, 1);
+    assert_type<SkRecords::SetMatrix>(r, rerecord, 2);
+    assert_type<SkRecords::DrawBitmapRectToRect>(r, rerecord, 3);
+    assert_type<SkRecords::Restore>(r, rerecord, 4);
+    assert_type<SkRecords::DrawRect>(r, rerecord, 5);
+    assert_type<SkRecords::Restore>(r, rerecord, 6);
 }
 
 DEF_TEST(RecordReplaceDraw_Replace, r)        { test_replacements(r, false); }