Merge pull request #2638 from sebv/master

Android test fixes
added --gappium option
gappium and selendroid test fixes