added --gappium option
gappium and selendroid test fixes
Merge pull request #2640 from sebv/master

Gappium + Selendroid test fixes