Auto merge of #145 - aneeshusa:enable-android-on-travis, r=Manishearth
Auto merge of #145 - aneeshusa:enable-android-on-travis, r=Manishearth

Re-enable Android states on Travis

The larger memory limits on the Trusty beta will
hopefully make these less flaky.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/145)
<!-- Reviewable:end -->

rwaweber/saltfs,UK992/saltfs,rwaweber/saltfs,setupminimal/saltfs,ALikhachev/saltfs,setupminimal/saltfs,UK992/saltfs,setupminimal/saltfs,rwaweber/saltfs,UK992/saltfs,ALikhachev/saltfs,ALikhachev/saltfs,servo/saltfs,servo/saltfs