Enable flattening/unflattening with custom unflatten procs

tests/BitmapHeapTest.cpp

Index: tests/BitmapHeapTest.cpp
diff --git a/tests/BitmapHeapTest.cpp b/tests/BitmapHeapTest.cpp
index 89e6faf76491089c8c361d4dcba1d9af589c5d06..f9d4ee19bb5da1e37da88c68133231fced96c3e7 100644
--- a/tests/BitmapHeapTest.cpp
+++ b/tests/BitmapHeapTest.cpp
@@ -88,9 +88,7 @@ DEF_TEST(BitmapHeap, reporter) {
     index = dictionary.find(*bitmapShader);
     heap.endAddingOwnersDeferral(false);
 
-    // The dictionary should report the same index since the new entry is identical.
     // The bitmap heap should contain the bitmap, but with no references.
-    REPORTER_ASSERT(reporter, 1 == index);
     REPORTER_ASSERT(reporter, heap.count() == 1);
     REPORTER_ASSERT(reporter, SkBitmapHeapTester::GetRefCount(heap.getEntry(0)) == 0);
 }