Fix broken Android framework builds

bench/nanobench.cpp

Index: bench/nanobench.cpp
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index c07bfa0d8d7cbdf2ae36e7cf8e4a5ce05365c168..5a009521456a2019adbd928b930a3c62b77016ef 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -436,12 +436,11 @@ static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* c
     #undef CPU_CONFIG
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
-    if (is_cpu_config_allowed("hwui", config)) {
-        Config config = { "hwui", Benchmark::kHWUI_Backend, kRGBA_8888_SkColorType,
+    if (config->getTag().equals("hwui")) {
+        Config config = { SkString("hwui"), Benchmark::kHWUI_Backend, kRGBA_8888_SkColorType,
                           kPremul_SkAlphaType, 0, kBogusGLContextType, kBogusGLContextOptions,
                           false };
         configs->push_back(config);
-        return;
     }
 #endif
 }