Merge "Put inlined ArtMethod pointer in stack maps."

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc runtime/class_linker.cc
Simple merge

diff --cc runtime/entrypoints/entrypoint_utils-inl.h
Simple merge