Allows uiautomator to be used on devices with no sdcard

- Version 2.3.21
- Changed mocks to support uiautomator new command line
Ignore dont-commits