Subzero: Run sandboxed cross tests, and do some cleanup.

tests_lit/llvm2ice_tests/elf_container.ll

 ; Tests that we generate an ELF container with fields that make sense,
 ; cross-validating against llvm-mc.
 
 ; For the integrated ELF writer, we can't pipe the output because we need
 ; to seek backward and patch up the file headers. So, use a temporary file.
 ; RUN: %p2i -i %s --filetype=obj --args -O2 --verbose none -o %t \
 ; RUN:   && llvm-readobj -file-headers -sections -section-data \
 ; RUN:       -relocations -symbols %t | FileCheck %s
 
 ; RUN: %if --need=allow_dump --command %p2i -i %s --args -O2 --verbose none \
-; RUN:   | %if --need=allow_dump --command llvm-mc -triple=i686-none-nacl \
+; RUN:   | %if --need=allow_dump --command llvm-mc -triple=i686-nacl \
 ; RUN:     -filetype=obj -o - \
 ; RUN:   | %if --need=allow_dump --command llvm-readobj -file-headers \
 ; RUN:     -sections -section-data -relocations -symbols - \
 ; RUN:   | %if --need=allow_dump --command FileCheck %s
 
 ; Add a run that shows relocations in code inline.
 ; RUN: %p2i -i %s --filetype=obj --args -O2 --verbose none -o %t \
 ; RUN:   && objdump -w -d -r -Mintel %t \
 ; RUN:   | FileCheck --check-prefix=TEXT-RELOCS %s
 
@@ skipping 616 matching lines @@
 ; CHECK:        Symbol {
 ; CHECK:          Name: memset
 ; CHECK-NEXT:     Value: 0x0
 ; CHECK-NEXT:     Size: 0
 ; CHECK-NEXT:     Binding: Global
 ; CHECK-NEXT:     Type: None
 ; CHECK-NEXT:     Other: 0
 ; CHECK-NEXT:     Section: Undefined
 ; CHECK-NEXT:   }
 ; CHECK: ]