Simplify linkages to Android framework internals

bench/nanobenchAndroid.cpp

Index: bench/nanobenchAndroid.cpp
diff --git a/bench/nanobenchAndroid.cpp b/bench/nanobenchAndroid.cpp
index 50673c974864577739ecf3bb7157471c173bbae0..7a166d45a06336bed2667fbdc9c4f1ab4c111abf 100644
--- a/bench/nanobenchAndroid.cpp
+++ b/bench/nanobenchAndroid.cpp
@@ -7,19 +7,12 @@
 
 #include "nanobenchAndroid.h"
 
-#include "AnimationContext.h"
-#include "IContextFactory.h"
-#include "SkiaCanvasProxy.h"
-#include "android/rect.h"
-#include "android/native_window.h"
-#include "renderthread/TimeLord.h"
-
 /* These functions are only compiled in the Android Framework. */
 
 HWUITarget::HWUITarget(const Config& c, Benchmark* bench) : Target(c) { }
 
 void HWUITarget::setup() {
-    this->renderer.proxy->fence();
+    this->renderer.fence();
 }
 
 SkCanvas* HWUITarget::beginTiming(SkCanvas* canvas) {
@@ -39,7 +32,7 @@ void HWUITarget::endTiming() {
 }
 
 void HWUITarget::fence() {
-    this->renderer.proxy->fence();
+    this->renderer.fence();
 }
 
 bool HWUITarget::needsFrameTiming(int* frameLag) const {
@@ -49,7 +42,7 @@ bool HWUITarget::needsFrameTiming(int* frameLag) const {
 }
 
 bool HWUITarget::init(SkImageInfo info, Benchmark* bench) {
-    this->renderer.initialize({bench->getSize().x(), bench->getSize().y()});
+    this->renderer.initialize(bench->getSize().x(), bench->getSize().y());
     return true;
 }