auto merge of #12216 : alexcrichton/rust/another-snap-fix, r=brson

Hurray more snapshot blockers!

Author: bors

src/test/run-pass-fulldeps/syntax-extension-fourcc.rs

@@ -11,7 +11,7 @@
 // ignore-fast Feature gating doesn't work
 // ignore-stage1
 // ignore-pretty
-// ignore-android
+// ignore-cross-compile
 
 #[feature(phase)];