Simplify linkages to Android framework internals

bench/nanobenchAndroid.h

Index: bench/nanobenchAndroid.h
diff --git a/bench/nanobenchAndroid.h b/bench/nanobenchAndroid.h
index 16a81cfe5e6433af9c6a0069fcc4d80038130318..ef28751acaeb6fc2d8fae81bb577d6420ac07949 100644
--- a/bench/nanobenchAndroid.h
+++ b/bench/nanobenchAndroid.h
@@ -9,14 +9,14 @@
 #define nanobenchAndroid_DEFINED
 
 #include "SkAndroidSDKCanvas.h"
-#include "SkHwuiRenderer.h"
+#include <utils/TestWindowContext.h>
 
 #include "nanobench.h"
 
 struct HWUITarget : public Target {
     explicit HWUITarget(const Config& c, Benchmark* bench);
 
-    SkHwuiRenderer renderer;
+    android::uirenderer::TestWindowContext renderer;
     SkAndroidSDKCanvas fc;
 
     void setup() override;