Update from https://crrev.com/329939

testing/test.gni

Index: testing/test.gni
diff --git a/testing/test.gni b/testing/test.gni
index ec56f012893982241618686b4a683414ba0d8b22..b4cdbede08b9e3410b17930515260151be30433f 100644
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -117,8 +117,8 @@ template("test") {
       unittests_dep = ":$library_name"
       apk_name = main_target_name
       if (defined(invoker.output_name)) {
-        test_output_name = invoker.output_name
-        unittests_binary = "lib${test_output_name}.so"
+        apk_name = invoker.output_name
+        unittests_binary = "lib${apk_name}.so"
       }
       deps = [
         ":$library_name",