[Sync] //components/sync external changes [DO NOT SUBMIT]

build/android/pylib/chrome_test_server_spawner.py

Index: build/android/pylib/chrome_test_server_spawner.py
diff --git a/build/android/pylib/chrome_test_server_spawner.py b/build/android/pylib/chrome_test_server_spawner.py
index ec2896f654862a00fab31f35a34f255551c8db30..e1eb6b384f6e6a1e0bc2403273b1358a03e5acb7 100644
--- a/build/android/pylib/chrome_test_server_spawner.py
+++ b/build/android/pylib/chrome_test_server_spawner.py
@@ -35,7 +35,8 @@ os.environ['PYTHONPATH'] = os.environ.get('PYTHONPATH', '') + (':%s:%s:%s:%s:%s'
        os.path.join(host_paths.DIR_SOURCE_ROOT, 'third_party', 'pyftpdlib',
                     'src'),
        os.path.join(host_paths.DIR_SOURCE_ROOT, 'net', 'tools', 'testserver'),
-       os.path.join(host_paths.DIR_SOURCE_ROOT, 'sync', 'tools', 'testserver')))
+       os.path.join(host_paths.DIR_SOURCE_ROOT, 'components', 'sync', 'tools',
+                    'testserver')))
 
 
 SERVER_TYPES = {
@@ -219,7 +220,8 @@ class TestServerThread(threading.Thread):
     self._GenerateCommandLineArguments()
     command = host_paths.DIR_SOURCE_ROOT
     if self.arguments['server-type'] == 'sync':
-      command = [os.path.join(command, 'sync', 'tools', 'testserver',
+      command = [os.path.join(command, 'components', 'sync', 'tools',
+                              'testserver',
                               'sync_testserver.py')] + self.command_line
     else:
       command = [os.path.join(command, 'net', 'tools', 'testserver',