Cleanup/refactor of appium/android startup/shutdown