Convert mojo_test_apk android_apk->instrumentation_test_apk

mojo/android/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/android/rules.gni")
 
 group("android") {
   testonly = true
   deps = [
     ":mojo_javatests",
@@ skipping 114 matching lines @@
     "//build/config/sanitizers:deps",
     "//mojo/edk/system",
     "//mojo/message_pump",
     "//mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils",
     "//mojo/public/cpp/environment",
     "//mojo/public/cpp/test_support:test_utils",
   ]
   defines = [ "UNIT_TEST" ]
 }
 
-android_apk("mojo_test_apk") {
-  testonly = true
-  create_dist_ijar = true
+instrumentation_test_apk("mojo_test_apk") {
   deps = [
     ":mojo_java_unittests",
     ":mojo_javatests",
     ":system_java",
     "//base:base_java",
     "//mojo/public/interfaces/bindings/tests:test_interfaces",
     "//mojo/public/java:bindings",
   ]
   native_libs = [ "libmojo_java_unittests.so" ]
   apk_name = "MojoTest"
   android_manifest = "javatests/AndroidManifest.xml"
 }