Split apk-build.xml into 3 steps

chrome/chrome_android.gypi

 # Copyright (c) 2012 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.
 {
   'variables': {
     'chromium_code': 1,
     'package_name': 'chromium_testshell',
   },
   'includes': [
     'chrome_android_paks.gypi', # Included for the list of pak resources.
@@ skipping 40 matching lines @@
       'dependencies': [
         '../media/media.gyp:media_java',
         'chrome.gyp:chrome_java',
         'chromium_testshell_paks',
         'libchromiumtestshell',
       ],
       'variables': {
         'apk_name': 'ChromiumTestShell',
         'manifest_package_name': 'org.chromium.chrome.testshell',
         'java_in_dir': 'android/testshell/java',
-        'resource_dir': '../res',
+        'resource_dir': 'android/testshell/res',
         'asset_location': '<(ant_build_out)/../assets/<(package_name)',
         'native_libs_paths': [ '<(SHARED_LIB_DIR)/libchromiumtestshell.so', ],
         'additional_input_paths': [
           '<@(chrome_android_pak_output_resources)',
           '<(chrome_android_pak_output_folder)/devtools_resources.pak',
         ],
       },
       'includes': [ '../build/java_apk.gypi', ],
     },
     {
@@ skipping 68 matching lines @@
           'destination': '<(chrome_android_pak_output_folder)',
           'files': [
             '<@(chrome_android_pak_input_resources)',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
           ],
         }
       ],
     },
   ],
 }