Split apk-build.xml into 3 steps

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 3980d6697eaa00fc11b1d586521fbcc734ba875b..ef37f56682bfca50da10a694504e2ea90e27c646 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1017,7 +1017,7 @@
           'variables': {
             'apk_name': 'content_browsertests',
             'java_in_dir': 'shell/android/browsertests_apk',
-            'resource_dir': 'res',
+            'resource_dir': 'shell/android/browsertests_apk/res',
             'native_libs_paths': ['<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_browsertests<(SHARED_LIB_SUFFIX)'],
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(ant_build_out)/content_shell/assets',
@@ -1060,9 +1060,9 @@
           ],
           'variables': {
             'apk_name': 'ContentShellTest',
-            'java_in_dir': '../content/shell/android/javatests',
-            'additional_src_dirs': ['../content/public/android/javatests/',],
-            'resource_dir': '../shell_apk/res',
+            'java_in_dir': 'shell/android/javatests',
+            'resource_dir': 'shell/android/shell_apk/res',
+            'additional_src_dirs': ['public/android/javatests/',],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],