Change BKPT and UDF encodings on ARM.

tests/syscall_return_sandboxing/sandboxed_arm.S

 /*
- * Copyright 2010 The Native Client Authors.  All rights reserved.
- * Use of this source code is governed by a BSD-style license that can
- * be found in the LICENSE file.
+ * Copyright (c) 2012 The Native Client Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  */
 
+#include "native_client/src/include/arm_sandbox.h"
+
         /*
          * assume 32-byte trampoline slots, 16-byte bundles.
          */
 #define GETTIMEOFDAY_ADDR 0x10500
 
         .data
 timebuf:
         .space 0x200 /* enough for a timeval */
 
         .text
         .globl SyscallReturnIsSandboxed
 SyscallReturnIsSandboxed:
         nop
         push {lr}
         ldr r0, addrOfTimeBuf
         mov r1, #0
 
         adr lr, bad
         ldr r2, addrOfGetTimeOfDaySyscallAddr
         bic r2, r2, #0xf000000f
         bx  r2
 
         eor r0, r0, #1
 bad:    pop {lr}
         bic lr, lr, #0xf000000f
         bx lr
 
 
-        bkpt 0x7777
+        .word NACL_INSTR_LITERAL_POOL_HEAD
         /*
          * Put a disallowed instruction here to ensure that the bkpt
          * data bundle marker works.  If the marker does not work, then
          * whether this code passes the validator is a matter of chance.
          */
         mov pc, r0
 addrOfGetTimeOfDaySyscallAddr:
         .word GETTIMEOFDAY_ADDR
 addrOfTimeBuf:
         .word timebuf