Add APK targets for content_unittests and net_unittests.

ui/ui_unittests.gypi

Index: ui/ui_unittests.gypi
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index f9c9c78f60028d80fbb3438b1222d42ced8aa4e8..717ec2136b3ec852046093539b11bf36605007a3 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -220,36 +220,11 @@
           'dependencies': [
             'ui_unittests',
           ],
-          'actions': [
-            {
-              # Generate apk files (including source and antfile) from
-              # a template, and builds them.
-              'action_name': 'generate_and_build',
-              'inputs': [
-                '../testing/android/AndroidManifest.xml',
-                '../testing/android/generate_native_test.py',
-                '<(PRODUCT_DIR)/lib.target/libui_unittests.so',
-                '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
-              ],
-              'outputs': [
-                '<(PRODUCT_DIR)/ui_unittests_apk/ui_unittests-debug.apk',
-              ],
-              'action': [
-                '../testing/android/generate_native_test.py',
-                '--native_library',
-                '<(PRODUCT_DIR)/lib.target/libui_unittests.so',
-                # TODO(jrg): find a better way to specify jar
-                # dependencies.  Hard coding seems fragile.
-                '--jar',
-                '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
-                '--output',
-                '<(PRODUCT_DIR)/ui_unittests_apk',
-                '--ant-args',
-                '-DPRODUCT_DIR=<(PRODUCT_DIR)',
-                '--ant-compile'
-              ],
-            },
-          ]
+          'variables': {
+            'test_suite_name': 'ui_unittests',
+            'jar_name': 'chromium_base.jar',
+          },
+          'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],