Move HWUI boilerplate into utils/android

bench/nanobenchAndroid.h

Index: bench/nanobenchAndroid.h
diff --git a/bench/nanobenchAndroid.h b/bench/nanobenchAndroid.h
index 3baeb1270fb5794a6e6a87e9fb1c7a8b806377d5..7f6ff441d6a25b2eba279580f0ec08ec6aa95fe2 100644
--- a/bench/nanobenchAndroid.h
+++ b/bench/nanobenchAndroid.h
@@ -8,29 +8,15 @@
 #ifndef nanobenchAndroid_DEFINED
 #define nanobenchAndroid_DEFINED
 
-#include "DisplayListRenderer.h"
-#include "RenderNode.h"
 #include "SkAndroidSDKCanvas.h"
-#include "gui/BufferQueue.h"
-#include "gui/CpuConsumer.h"
-#include "gui/IGraphicBufferConsumer.h"
-#include "gui/IGraphicBufferProducer.h"
-#include "gui/Surface.h"
-#include "renderthread/RenderProxy.h"
+#include "SkHwuiRenderer.h"
 
 #include "nanobench.h"
 
 struct HWUITarget : public Target {
     explicit HWUITarget(const Config& c, Benchmark* bench);
 
-    SkAutoTDelete<android::uirenderer::RenderNode> rootNode;
-    SkAutoTDelete<android::uirenderer::renderthread::RenderProxy> proxy;
-    SkAutoTDelete<android::uirenderer::DisplayListRenderer> renderer;
-    android::sp<android::IGraphicBufferProducer> producer;
-    android::sp<android::IGraphicBufferConsumer> consumer;
-    android::sp<android::CpuConsumer> cpuConsumer;
-    android::sp<android::Surface> androidSurface;
-    SkISize size;
+    SkHwuiRenderer renderer;
     SkAndroidSDKCanvas fc;
 
     void setup() override;
@@ -39,11 +25,8 @@ struct HWUITarget : public Target {
     void fence() override;
     bool needsFrameTiming() const override;
 
-    /// Returns false if initialization fails
     bool init(SkImageInfo info, Benchmark* bench) override;
     bool capturePixels(SkBitmap* bmp) override;
 };
 
-
-
 #endif  // nanobenchAndroid_DEFINED