[Android] Revise devil environment handling of host dependencies.

build/android/devil/devil_env_test.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 # pylint: disable=protected-access
 
 import logging
 import sys
 import unittest
@@ skipping 30 matching lines @@
     def mock_environment(env_var):
       return '/my/fake/adb/path' if env_var == 'ADB_PATH' else None
 
     with mock.patch('os.environ.get',
                     mock.Mock(side_effect=mock_environment)):
       env_config = devil_env._GetEnvironmentVariableConfig()
     self.assertEquals(
         {
           'adb': {
             'file_info': {
-              'android_linux2': {
+              'linux_x86_64': {
                 'local_paths': ['/my/fake/adb/path'],
               },
             },
           },
         },
         env_config.get('dependencies'))
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)