Fix two SkRecord-backed layer hoisting bugs

tests/RecordReplaceDrawTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #if SK_SUPPORT_GPU
 
 #include "Test.h"
@@ skipping 94 matching lines @@
     if (useBBH) {
         SkRTreeFactory factory;
         bbh.reset((factory)(kWidth, kHeight));
         SkRecordFillBounds(record, bbh);
     }
 
     SkRecord rerecord;
     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); }
 DEF_TEST(RecordReplaceDraw_ReplaceWithBBH, r) { test_replacements(r, true); }
 
 #endif