Change BKPT and UDF encodings on ARM.

tests/faulted_thread_queue/faultqueue_test_guest.c

 /*
  * 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 <assert.h>
 #include <setjmp.h>
 #include <stdio.h>
 
+#include "native_client/src/include/arm_sandbox.h"
+#include "native_client/src/include/nacl_macros.h"
 #include "native_client/tests/common/register_set.h"
 
 
 /*
  * This test program sets registers to a known state and then faults,
  * so that faultqueue_test_host.c can check that it receives
  * notification of the fault.
  *
  * faultqueue_test_host.c makes execution resume from the instruction
  * after FaultAddr.  On x86, it also checks that single-stepping these
@@ skipping 39 matching lines @@
         ".byte 0x90\n" /* nop */
         ".byte 0x66, 0x90\n" /* xchg %ax, %ax */
         ".byte 0x0f, 0x1f, 0x00\n" /* nopl (%eax) */
         ".byte 0x0f, 0x1f, 0x40, 0x00\n" /* nopl 0x0(%eax) */
         ".byte 0x0f, 0x1f, 0x44, 0x00, 0x00\n" /* nopl 0x0(%eax, %eax, 1) */
         "jmp DoLongjmp\n");
 #elif defined(__arm__)
     ASM_WITH_REGS(
         expected_regs,
         ".p2align 4\n"
-        "FaultAddr: bkpt 0x7777\n"
+        "FaultAddr: .word " NACL_TO_STRING(NACL_INSTR_HALT_FILL) "\n"
         /*
          * ARM does not provide hardware single-stepping so we do not
          * test it here, unlike in the x86 case.
          */
         "b DoLongjmp\n"
         ".p2align 4\n");
 #else
 # error Unknown architecture
 #endif
   }
   return 0;
 }