Merge pull request #1403 from jlipps/master

make sure we don't shut uiautomator down if it's already gone
(Android) Don't uninstall the app when --no-reset is used.
Merge pull request #1405 from paymand/no_reset

(Android) Don't uninstall the app when --no-reset is used.
update activity matching regex for android 4.4