Remove DisplayList.h dependency from Canvas.h

Canvas is included in a lot of places, reduce include
dependencies

Test: make
Change-Id: Iab513de8d4bc3eb18220307acc124859dbf44030
diff --git a/libs/hwui/tests/microbench/RenderNodeBench.cpp b/libs/hwui/tests/microbench/RenderNodeBench.cpp
index dd3f737..6aed251 100644
--- a/libs/hwui/tests/microbench/RenderNodeBench.cpp
+++ b/libs/hwui/tests/microbench/RenderNodeBench.cpp
@@ -35,25 +35,12 @@
 void BM_RenderNode_recordSimple(benchmark::State& state) {
     sp<RenderNode> node = new RenderNode();
     std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(100, 100));
-    static_cast<void>(canvas->finishRecording());
+    canvas->finishRecording(node.get());
 
     while (state.KeepRunning()) {
         canvas->resetRecording(100, 100, node.get());
         canvas->drawColor(0x00000000, SkBlendMode::kSrcOver);
-        node->setStagingDisplayList(canvas->finishRecording());
+        canvas->finishRecording(node.get());
     }
 }
 BENCHMARK(BM_RenderNode_recordSimple);
-
-void BM_RenderNode_recordSimpleWithReuse(benchmark::State& state) {
-    sp<RenderNode> node = new RenderNode();
-    std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(100, 100));
-    static_cast<void>(canvas->finishRecording());
-
-    while (state.KeepRunning()) {
-        canvas->resetRecording(100, 100, node.get());
-        canvas->drawColor(0x00000000, SkBlendMode::kSrcOver);
-        canvas->finishRecording().clear(node.get());
-    }
-}
-BENCHMARK(BM_RenderNode_recordSimpleWithReuse);
\ No newline at end of file