Merge pull request #1664 from rockbot/master

requires users to specify their device in their desired capabilities (fix #1656)
first attempt at fixing appium avd startup bug