Revert of [Android] Reland cleanup of old_interface in build/android/pylib.

build/android/pylib/screenshot.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.
 
 import os
 import signal
 import tempfile
-import time
 
 from pylib import cmd_helper
 
 # TODO(jbudorick) Remove once telemetry gets switched over.
 import pylib.android_commands
 import pylib.device.device_utils
 
 
 class VideoRecorder(object):
   """Records a screen capture video from an Android Device (KitKat or newer).
@@ skipping 57 matching lines @@
     self._recorder.wait()
 
   def Pull(self, host_file=None):
     """Pull resulting video file from the device.
 
     Args:
       host_file: Path to the video file to store on the host.
     Returns:
       Output video file name on the host.
     """
-    # TODO(jbudorick): Merge filename generation with the logic for doing so in
-    # DeviceUtils.
-    host_file_name = (
-        host_file
-        or 'screen-recording-%s.mp4' % time.strftime('%Y%m%dT%H%M%S',
-                                                     time.localtime()))
+    host_file_name = host_file or ('screen-recording-%s.mp4' %
+                                   self._device.old_interface.GetTimestamp())
     host_file_name = os.path.abspath(host_file_name)
+    self._device.old_interface.EnsureHostDirectory(host_file_name)
     self._device.PullFile(self._device_file, host_file_name)
     self._device.RunShellCommand('rm -f "%s"' % self._device_file)
     return host_file_name