Fix screenshot.py

build/android/screenshot.py was creating a DeviceUtils. Then grabbing
it's old_interface (i.e. an AndroidCommands) and calling screenshot on
that. That then called TakeScreenshot from
build/android/pylib/screenshot.py passing itself. But
build/android/pylib/screenshot.py expects a DeviceUtils, not an
AndroidCommands. So wrap the AndroidCommands back into a DeviceUtils
first.

build/android/screenshot.py could probably just call into
build/android/pylib/screenshot.py directly.

TBR=jbudorick
NOTRY=true

Review URL: https://codereview.chromium.org/234533003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263157 0039d316-1c4b-4281-b951-d872f2087c98

build/android/pylib/android_commands.py

@@ -27,6 +27,7 @@ import constants
 import screenshot
 import system_properties
 from utils import host_utils
+from device import device_utils
 
 try:
   from pylib import pexpect
@@ -1721,7 +1722,7 @@ class AndroidCommands(object):
     Returns:
       Resulting host file name of the screenshot.
     """
-    return screenshot.TakeScreenshot(self, host_file)
+    return screenshot.TakeScreenshot(device_utils.DeviceUtils(self), host_file)
 
   def PullFileFromDevice(self, device_file, host_file):
     """Download |device_file| on the device from to |host_file| on the host.