Test fixes and rebase conflicts

src/test/run-pass-fulldeps/create-dir-all-bare.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-android
+
 #![feature(rustc_private)]
 
 extern crate rustc_back;

src/test/run-pass-fulldeps/rename-directory.rs

@@ -11,6 +11,7 @@
 // This test can't be a unit test in std,
 // because it needs TempDir, which is in extra
 
+// ignore-android
 // pretty-expanded FIXME #23616
 
 #![feature(rustc_private, path_ext)]

src/test/run-pass/big-literals.rs

@@ -21,5 +21,5 @@ pub fn main() {
     assert_eq!(0xffffffffffffffff, (-1 as u64));
     assert_eq!(18446744073709551615, (-1 as u64));
 
-    assert_eq!((-2147483648).wrapping_sub(1), 2147483647);
+    assert_eq!((-2147483648i32).wrapping_sub(1), 2147483647);
 }

src/test/run-pass/tcp-stress.rs

@@ -23,12 +23,12 @@ extern crate libc;
 use std::sync::mpsc::channel;
 use std::old_io::net::tcp::{TcpListener, TcpStream};
 use std::old_io::{Acceptor, Listener, Reader, Writer};
-use std::thread::{Builder, Thread};
+use std::thread::{self, Builder};
 use std::time::Duration;
 
 fn main() {
     // This test has a chance to time out, try to not let it time out
-    Thread::spawn(move|| -> () {
+    thread::spawn(move|| -> () {
         use std::old_io::timer;
         timer::sleep(Duration::milliseconds(30 * 1000));
         println!("timed out!");
@@ -36,7 +36,7 @@ fn main() {
     });
 
     let (tx, rx) = channel();
-    Thread::spawn(move || -> () {
+    thread::spawn(move || -> () {
         let mut listener = TcpListener::bind("127.0.0.1:0").unwrap();
         tx.send(listener.socket_name().unwrap()).unwrap();
         let mut acceptor = listener.listen();