Work around a rustc regression in macro name resolution

rust-lang/rust#53205

Author: SimonSapin

ports/servo/main.rs

@@ -17,6 +17,10 @@
 
 #![cfg_attr(feature = "unstable", feature(core_intrinsics))]
 
+// Have this here rather than in non_android_main.rs to work around
+// https://github.com/rust-lang/rust/issues/53205
+#[cfg(not(target_os = "android"))] #[macro_use] extern crate log;
+
 #[cfg(not(target_os = "android"))] include!("non_android_main.rs");
 
 #[cfg(target_os = "android")]

ports/servo/non_android_main.rs

@@ -9,7 +9,6 @@ extern crate gleam;
 extern crate glutin;
 #[macro_use] extern crate lazy_static;
 // The window backed by glutin
-#[macro_use] extern crate log;
 #[cfg(any(target_os = "linux", target_os = "macos"))] extern crate osmesa_sys;
 extern crate servo;
 #[cfg(feature = "unstable")]