Fix travis-ci task
Merge branch 'master' of git://github.com/pivotal/robolectric into robo-staging