Auto merge of #825 - malbarbo:android-fix-ci, r=alexcrichton

Fix android ci