runner extension for shell driver

Change-Id: Id25c28bf72b1f3af0e1429cba88640e8f362e379
diff --git a/utils/python/controllers/android_device.py b/utils/python/controllers/android_device.py
index 0a37c72..b81e798 100644
--- a/utils/python/controllers/android_device.py
+++ b/utils/python/controllers/android_device.py
@@ -33,6 +33,7 @@
 from vts.utils.python.controllers import fastboot
 from vts.runners.host.tcp_client import vts_tcp_client
 from vts.utils.python.mirror import hal_mirror
+from vts.utils.python.mirror import shell_mirror
 from vts.runners.host import errors
 import subprocess
 
@@ -319,6 +320,7 @@
                                      self.host_callback_port)
         self.hal = hal_mirror.HalMirror(self.host_command_port,
                                         self.host_callback_port)
+        self.shell = shell_mirror.ShellMirror(self.host_command_port)
 
     def __del__(self):
         if self.host_command_port:
diff --git a/utils/python/mirror/hal_mirror.py b/utils/python/mirror/hal_mirror.py
index 98014ac..21ee43e 100644
--- a/utils/python/mirror/hal_mirror.py
+++ b/utils/python/mirror/hal_mirror.py
@@ -199,8 +199,8 @@
         launched = client.LaunchDriverService(
             driver_type=ASysCtrlMsg.VTS_DRIVER_TYPE_HAL_CONVENTIONAL,
             service_name=service_name,
-            file_path=target_filename,
             bits=bits,
+            file_path=target_filename,
             target_class=target_class_id,
             target_type=target_type_id,
             target_version=target_version)