Changes from 3.7 merge to files not in upstream

test/NaCl/ARM/blx-sandboxing.ll

Index: test/NaCl/ARM/blx-sandboxing.ll
diff --git a/test/NaCl/ARM/blx-sandboxing.ll b/test/NaCl/ARM/blx-sandboxing.ll
index 3a2887ab967a15cac0f32df275a3fffef51d5216..7c78cd7fdb2ee07f3281d408166978187372f66d 100644
--- a/test/NaCl/ARM/blx-sandboxing.ll
+++ b/test/NaCl/ARM/blx-sandboxing.ll
@@ -6,10 +6,10 @@ entry:
   %aa.addr = alloca i32, align 4
   %bb.addr = alloca i32, align 4
   %f.addr = alloca i32 (i32)*, align 8
-  %0 = load i32 (i32)** %f.addr, align 8
-  %1 = load i32* %aa.addr, align 4
+  %0 = load i32 (i32)*, i32 (i32)** %f.addr, align 8
+  %1 = load i32, i32* %aa.addr, align 4
   %call1 = call i32 %0(i32 %1)
-; CHECK: bic	r1, r1, #3221225487
+; CHECK: bic	r1, r1, #-1073741809
 ; CHECK-NEXT: blx r1
   ret i32 %call1
 }