Test fixes and rebase conflicts, round 2

src/test/debuginfo/function-prologue-stepping-regular.rs

@@ -126,7 +126,6 @@
 // lldb-command:continue
 
 #![allow(unused_variables)]
-#![feature(old_io)]
 #![omit_gdb_pretty_printer_section]
 
 fn immediate_args(a: isize, b: bool, c: f64) {
@@ -157,7 +156,7 @@ fn assignment(mut a: u64, b: u64, c: f64) {
 }
 
 fn function_call(x: u64, y: u64, z: f64) {
-    std::old_io::stdio::print("Hi!")
+    println!("Hi!")
 }
 
 fn identifier(x: u64, y: u64, z: f64) -> u64 {

src/test/run-pass-fulldeps/issue-15149.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // no-prefer-dynamic
+// ignore-android
 
 #![feature(rustc_private)]
 

src/test/run-pass/drop-flag-skip-sanity-check.rs

@@ -63,5 +63,4 @@ fn test() {
         // drop-glue should detect the corruption of (at least one of)
         // the drop-flags.
     }
-    println!("We should never get here.");
 }