Merge pull request #2640 from sebv/master

Gappium + Selendroid test fixes
disabling various ci tests
splitting apidemo touch, gestures and find tests