Revert of Enable presubmit pylint in build/android.

build/android/pylib/gtest/test_package_apk.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.
 
 """Defines TestPackageApk to help run APK-based native tests."""
-# pylint: disable=W0212
 
 import logging
 import os
 import shlex
 import sys
 import tempfile
 import time
 
 from pylib import android_commands
+from pylib import cmd_helper
 from pylib import constants
 from pylib import pexpect
 from pylib.android_commands import errors
-from pylib.gtest.test_package import TestPackage
+
+from test_package import TestPackage
 
 
 class TestPackageApk(TestPackage):
   """A helper class for running APK-based native tests."""
 
   def __init__(self, suite_name):
     """
     Args:
       suite_name: Name of the test suite (e.g. base_unittests).
     """
@@ skipping 89 matching lines @@
     finally:
       self.tool.CleanUpEnvironment()
     logfile = android_commands.NewLineNormalizer(sys.stdout)
     return self._WatchFifo(adb, timeout=10, logfile=logfile)
 
   #override
   def Install(self, adb):
     self.tool.CopyFiles()
     adb.ManagedInstall(self.suite_path, False,
                             package_name=self._package_info.package)