Make the atrace agent use the correct version of ADB.

systrace/systrace/tracing_agents/atrace_agent_unittest.py

Index: systrace/systrace/tracing_agents/atrace_agent_unittest.py
diff --git a/systrace/systrace/tracing_agents/atrace_agent_unittest.py b/systrace/systrace/tracing_agents/atrace_agent_unittest.py
index 1efd185690f66034538d84a7ac0e0d43b2ad5381..2aff4fbfe2c9d1a06c2b295cb211b8348935f4a2 100755
--- a/systrace/systrace/tracing_agents/atrace_agent_unittest.py
+++ b/systrace/systrace/tracing_agents/atrace_agent_unittest.py
@@ -104,19 +104,6 @@ class AtraceAgentTest(unittest.TestCase):
     self.assertEqual(' '.join(TRACE_ARGS), ' '.join(tracer_args))
 
   @decorators.HostOnlyTest
-  def test_preprocess_trace_data(self):
-    with contextlib.nested(open(ATRACE_DATA_STRIPPED, 'r'),
-                           open(ATRACE_DATA_RAW, 'r')) as (f1, f2):
-      atrace_data = f1.read()
-      atrace_data_raw = f2.read()
-      options, categories = run_systrace.parse_options(SYSTRACE_CMD)
-      agent = atrace_agent.AtraceAgent()
-      agent._config = options
-      agent._config.atrace_categories = categories
-      trace_data = agent._preprocess_trace_data(atrace_data_raw)
-      self.assertEqual(atrace_data, trace_data)
-
-  @decorators.HostOnlyTest
   def test_extract_thread_list(self):
     with contextlib.nested(open(ATRACE_EXTRACTED_THREADS, 'r'),
                            open(ATRACE_THREAD_LIST)) as (f1, f2):