Reorganize Android's test scripts into packages.

build/android/pylib/instrumentation/apk_info.py

 # 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.
 
 """Gathers information about APKs."""
 
 import collections
 import logging
 import os
 import pickle
 import re
 
-import cmd_helper
+from pylib import cmd_helper
+
 
 # If you change the cached output of proguard, increment this number
 PICKLE_FORMAT_VERSION = 1
 
 def GetPackageNameForApk(apk_path):
   """Returns the package name of the apk file."""
   aapt_output = cmd_helper.GetCmdOutput(
       ['aapt', 'dump', 'badging', apk_path]).split('\n')
   package_name_re = re.compile(r'package: .*name=\'(\S*)\'')
   for line in aapt_output:
@@ skipping 153 matching lines @@
             if self._IsTestMethod(test) and self._AnnotationsMatchFilters(
                 annotation_filter_list, annotations)]
 
   def GetTestMethods(self):
     """Returns a list of all test methods in this apk as Class#testMethod."""
     return self._test_methods
 
   @staticmethod
   def IsPythonDrivenTest(test):
     return 'pythonDrivenTests' in test