Merge isolates to bleeding_edge.

src/arm/cpu-arm.cc

Index: src/arm/cpu-arm.cc
===================================================================
--- src/arm/cpu-arm.cc	(revision 7267)
+++ src/arm/cpu-arm.cc	(working copy)
@@ -42,8 +42,9 @@
 namespace internal {
 
 void CPU::Setup() {
-  CpuFeatures::Probe(true);
-  if (!CpuFeatures::IsSupported(VFP3) || Serializer::enabled()) {
+  CpuFeatures* cpu_features = Isolate::Current()->cpu_features();
+  cpu_features->Probe(true);
+  if (!cpu_features->IsSupported(VFP3) || Serializer::enabled()) {
     V8::DisableCrankshaft();
   }
 }
@@ -61,7 +62,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.
-  Simulator::FlushICache(start, size);
+  Simulator::FlushICache(Isolate::Current()->simulator_i_cache(), start, size);
 #else
   // Ideally, we would call
   //   syscall(__ARM_NR_cacheflush, start,