ARM: Merging constants in simulator and assembler header files and other clea...

src/arm/cpu-arm.cc

Index: src/arm/cpu-arm.cc
===================================================================
--- src/arm/cpu-arm.cc	(revision 6474)
+++ src/arm/cpu-arm.cc	(working copy)
@@ -56,7 +56,7 @@
   // that the Icache was flushed.
   // None of this code ends up in the snapshot so there are no issues
   // around whether or not to generate the code when building snapshots.
-  assembler::arm::Simulator::FlushICache(start, size);
+  Simulator::FlushICache(start, size);
 #else
   // Ideally, we would call
   //   syscall(__ARM_NR_cacheflush, start,