Merge pull request #2603 from sebv/master

Enabling selendroid ci test
enabling gappium tests