diff --git a/testrunner/adb_interface.py b/testrunner/adb_interface.py
index 33191f7..698ea8b 100755
--- a/testrunner/adb_interface.py
+++ b/testrunner/adb_interface.py
@@ -275,7 +275,7 @@
           (self.DEVICE_TRACE_DIR, instrumentation_path.split(".")[-1]))
 
     for key, value in instrumentation_args.items():
-      command_string += " -e %s %s" % (key, value)
+      command_string += " -e %s '%s'" % (key, value)
     if raw_mode:
       command_string += " -r"
     command_string += " -w %s" % instrumentation_path
diff --git a/testrunner/android_build.py b/testrunner/android_build.py
index 37ddf9e..584ef52 100644
--- a/testrunner/android_build.py
+++ b/testrunner/android_build.py
@@ -165,12 +165,5 @@
 
   Returns:
     The absolute file path of the Android test app build directory.
-
-  Raises:
-    AbortError: if Android host java library directory could not be found.
   """
-  path = os.path.join(GetProductOut(), "data", "app")
-  if not os.path.exists(path):
-    logger.Log("Error: app path could not be found %s" % path)
-    raise errors.AbortError
-  return path
+  return os.path.join(GetProductOut(), "data", "app")