Update from https://crrev.com/308996

build/android/pylib/utils/device_temp_file.py

 # Copyright 2013 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.
 
 """A temp file that automatically gets pushed and deleted from a device."""
 
 # pylint: disable=W0622
 
 import random
 import time
@@ skipping 25 matching lines @@
       try:
         self._adb.Shell('test -e %s' % self.name_quoted)
       except device_errors.AdbCommandFailedError:
         break # file does not exist
 
     # Immediately touch the file, so other temp files can't get the same name.
     self._adb.Shell('touch %s' % self.name_quoted)
 
   def close(self):
     """Deletes the temporary file from the device."""
-    # we use -f to ignore errors if the file is already gone
-    self._adb.Shell('rm -f %s' % self.name_quoted)
+    # ignore exception if the file is already gone.
+    try:
+      self._adb.Shell('rm -f %s' % self.name_quoted)
+    except device_errors.AdbCommandFailedError:
+      # file does not exist on Android version without 'rm -f' support (ICS)
+      pass
 
   def __enter__(self):
     return self
 
   def __exit__(self, type, value, traceback):
     self.close()