bring back git rev into appium output
simply override device for selendroid rather than including in caps
actually use our custom launch timeout in tests