Revert of [Android] Add a configurable environment for devil/. (RELAND 2)

build/java_apk.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.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 530 matching lines @@
               'action': [
                 'python', '<(DEPTH)/build/android/gyp/create_device_library_links.py',
                 '--build-device-configuration=<(build_device_config_path)',
                 '--libraries=@FileArg(<(ordered_libraries_file):libraries)',
                 '--script-host-path=<(symlink_script_host_path)',
                 '--script-device-path=<(symlink_script_device_path)',
                 '--target-dir=<(device_library_dir)',
                 '--apk=<(incomplete_apk_path)',
                 '--stamp=<(link_stamp)',
                 '--configuration-name=<(CONFIGURATION_NAME)',
-                '--output-directory=<(PRODUCT_DIR)',
               ],
             },
           ],
           'conditions': [
             ['create_standalone_apk == 1', {
               'actions': [
                 {
                   'action_name': 'create standalone APK',
                   'variables': {
                     'inputs': [
@@ skipping 127 matching lines @@
           ],
           'outputs': [
             '<(apk_install_record)',
           ],
           'action': [
             'python', '<(DEPTH)/build/android/gyp/apk_install.py',
             '--build-device-configuration=<(build_device_config_path)',
             '--install-record=<(apk_install_record)',
             '--configuration-name=<(CONFIGURATION_NAME)',
             '--android-sdk-tools', '<(android_sdk_tools)',
-            '--output-directory', '<(PRODUCT_DIR)',
           ],
           'conditions': [
             ['create_abi_split == 1', {
               'inputs': [
                 '<(final_apk_path)',
               ],
               'action': [
                 '--apk-path=<(final_apk_path)',
                 '--split-apk-path=<(incomplete_apk_path)',
               ],
@@ skipping 497 matching lines @@
             'native_libs_dir': '<(apk_package_native_libs_dir)',
           }, {
             'native_libs_dir': '<(DEPTH)/build/android/ant/empty/res',
           }],
         ],
       },
       'includes': ['android/apkbuilder_action.gypi'],
     },
   ],
 }