Subzero: Update tests and build scripts for sandboxing.

pydir/crosstest.py

Index: pydir/crosstest.py
diff --git a/pydir/crosstest.py b/pydir/crosstest.py
index 2faff705f07bb964ed8b48e3f2e967c6ddee6524..9b8327322a2b049ce854cb4f9463e7367b2fd743 100755
--- a/pydir/crosstest.py
+++ b/pydir/crosstest.py
@@ -144,12 +144,9 @@ if __name__ == '__main__':
         else:
             objs.append(bitcode)
 
-    # Use 'clang szrt.c'  -or-  'clang++ szrt.cpp'
     objs.append((
-            '{root}/toolchain_build/src/subzero/runtime/szrt.{ext}'
-            ).format(root=nacl_root, ext='c' if pure_c else 'cpp'))
-    objs.append((
-            '{root}/toolchain_build/src/subzero/runtime/szrt_i686.ll'
+            '{root}/toolchain_build/src/subzero/build/runtime/' +
+            'szrt_native_x8632.o'
             ).format(root=nacl_root))
     linker = 'clang' if pure_c else 'clang++'
     shellcmd([linker, '-g', '-m32', args.driver] +