Merge "Revert "Inline across dex files for JIT.""

diff --cc compiler/optimizing/nodes.h
Simple merge

diff --cc compiler/optimizing/optimizing_compiler.cc
Simple merge

diff --cc compiler/optimizing/stack_map_stream.cc
index 54614bc,a9a1e6f..668108d
--- 1/compiler/optimizing/stack_map_stream.cc
--- 2/compiler/optimizing/stack_map_stream.cc
+++ b/compiler/optimizing/stack_map_stream.cc
@@@ -16,11 -16,7 +16,10 @@@
  
  #include "stack_map_stream.h"
  
 +#include <unordered_map>
 +
 +#include "base/stl_util.h"
  #include "art_method.h"
- #include "optimizing/optimizing_compiler.h"
  #include "runtime.h"
  #include "scoped_thread_state_change-inl.h"