Added android driver
Added capability deviceName
Merge appium-setup