Steal working android setup from deckard
Merge pull request #1178 from seadowg/fix-travis

Fix travis build