Enable Android
Update to work on Appium master