am f36191d2: Merge "Revert "Fix for uiautomator arguments that contain spaces"" into jb-mr2-dev

* commit 'f36191d2a51bc2873315870cf262895075f57f5c':
  Revert "Fix for uiautomator arguments that contain spaces"