[Android] Don't use zip pushing if not built or on user builds.

build/android/pylib/device/device_utils_test.py

Index: build/android/pylib/device/device_utils_test.py
diff --git a/build/android/pylib/device/device_utils_test.py b/build/android/pylib/device/device_utils_test.py
index 52aef0ac3f7eba3d2cca87788efd579ad28913e8..513b538f84c028f704613195cc44754785d69958 100755
--- a/build/android/pylib/device/device_utils_test.py
+++ b/build/android/pylib/device/device_utils_test.py
@@ -288,6 +288,21 @@ class DeviceUtilsEnableRootTest(DeviceUtilsOldImplTest):
         self.device.EnableRoot()
 
 
+class DeviceUtilsIsUserBuildTest(DeviceUtilsOldImplTest):
+
+  def testIsUserBuild_yes(self):
+    with self.assertCalls(
+        'adb -s 0123456789abcdef shell getprop ro.build.type',
+        'user\r\n'):
+      self.assertTrue(self.device.IsUserBuild())
+
+  def testIsUserBuild_no(self):
+    with self.assertCalls(
+        'adb -s 0123456789abcdef shell getprop ro.build.type',
+        'userdebug\r\n'):
+      self.assertFalse(self.device.IsUserBuild())
+
+
 class DeviceUtilsGetExternalStoragePathTest(DeviceUtilsOldImplTest):
 
   def testGetExternalStoragePath_succeeds(self):
@@ -896,12 +911,12 @@ class DeviceUtilsPushChangedFilesIndividuallyTest(DeviceUtilsNewImplTest):
         '/test/host/path/file2', '/test/device/path/file2')
 
 
+@mock.patch('pylib.device.commands.install_commands.Installed', new=None)
+@mock.patch('pylib.device.commands.install_commands.InstallCommands', new=None)
 class DeviceUtilsPushChangedFilesZippedTest(DeviceUtilsHybridImplTest):
 
   def setUp(self):
     super(DeviceUtilsPushChangedFilesZippedTest, self).setUp()
-    self.original_install_commands = self.device._InstallCommands
-    self.device._InstallCommands = mock.Mock()
 
   def testPushChangedFilesZipped_empty(self):
     test_files = []