Update from https://crrev.com/329939

testing/test.gni

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # ==============================================================================
 # TEST SETUP
 # ==============================================================================
 
 # Define a test as an executable (or apk on Android) with the "testonly" flag
 # set.
@@ skipping 99 matching lines @@
       }
       if (defined(invoker.visibility)) {
         visibility = invoker.visibility
       }
     }
 
     unittest_apk(apk_name) {
       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",
       ]
       if (defined(invoker.apk_deps)) {
         deps += invoker.apk_deps
       }
       if (defined(invoker.apk_asset_location)) {
         asset_location = invoker.apk_asset_location
       }
@@ skipping 99 matching lines @@
       }
       if (defined(invoker.sources)) {
         sources = invoker.sources
       }
       if (defined(invoker.visibility)) {
         visibility = invoker.visibility
       }
     }
   }
 }