Organize adb install cmds and reboot on failure

build/android/pylib/test_package_apk.py

Index: build/android/pylib/test_package_apk.py
diff --git a/build/android/pylib/test_package_apk.py b/build/android/pylib/test_package_apk.py
index de6fdb7c9ede28ced655ff2916b924ff9a6de075..c276825f4e8ae7b8e30a48f2df57ca00e306925d 100644
--- a/build/android/pylib/test_package_apk.py
+++ b/build/android/pylib/test_package_apk.py
@@ -97,13 +97,8 @@ class TestPackageApk(TestPackage):
   def StripAndCopyExecutable(self):
     # Always uninstall the previous one (by activity name); we don't
     # know what was embedded in it.
-    logging.info('Uninstalling any activity with the test name')
-    self.adb.Adb().SendCommand('uninstall org.chromium.native_test',
-                               timeout_time=60*5)
-    logging.info('Installing new apk')
-    self.adb.Adb().SendCommand('install -r ' + self.test_suite_full,
-                               timeout_time=60*5)
-    logging.info('Install has completed.')
+    self.adb.ManagedInstall(self.test_suite_full, False,
+                            package_name='org.chromium.native_test')
 
   def _GetTestSuiteBaseName(self):
     """Returns the  base name of the test suite."""