resolved conflicts for merge of 38c488bc to lmp-dev-plus-aosp

Change-Id: If8fbbd51232fd01a481cb47df426de169c0c830c

diff --cc runtime/Android.mk
index d82e842,ff12f3d..6fa34c4
--- 1/runtime/Android.mk
--- 2/runtime/Android.mk
+++ b/runtime/Android.mk
@@@ -275,39 -271,40 +275,40 @@@ $(info TODOMips64: $(LOCAL_PATH)/Androi
  endif # TARGET_ARCH != mips64
  
  LIBART_HOST_SRC_FILES := \
 -      $(LIBART_COMMON_SRC_FILES) \
 -      base/logging_linux.cc \
 -      monitor_linux.cc \
 -      runtime_linux.cc \
 -      thread_linux.cc
 +  $(LIBART_COMMON_SRC_FILES) \
 +  base/logging_linux.cc \
 +  monitor_linux.cc \
 +  runtime_linux.cc \
 +  thread_linux.cc
  
  LIBART_HOST_SRC_FILES_32 := \
 -      $(LIBART_SRC_FILES_x86)
 +  $(LIBART_SRC_FILES_x86)
  
  LIBART_HOST_SRC_FILES_64 := \
 -      $(LIBART_SRC_FILES_x86_64)
 +  $(LIBART_SRC_FILES_x86_64)
  
  LIBART_ENUM_OPERATOR_OUT_HEADER_FILES := \
 -      arch/x86_64/registers_x86_64.h \
 -      base/mutex.h \
 -      dex_file.h \
 -      dex_instruction.h \
 -      gc/collector/gc_type.h \
 -      gc/collector_type.h \
 -      gc/space/space.h \
 -      gc/heap.h \
 -      indirect_reference_table.h \
 -      instruction_set.h \
 -      invoke_type.h \
 -      jdwp/jdwp.h \
 -      jdwp/jdwp_constants.h \
 -      lock_word.h \
 -      mirror/class.h \
 -      oat.h \
 -      object_callbacks.h \
 -      quick/inline_method_analyser.h \
 -      thread.h \
 -      thread_state.h \
 -      verifier/method_verifier.h
 +  arch/x86_64/registers_x86_64.h \
 +  base/mutex.h \
 +  dex_file.h \
 +  dex_instruction.h \
 +  gc/collector/gc_type.h \
++  gc/collector_type.h \
 +  gc/space/space.h \
 +  gc/heap.h \
 +  indirect_reference_table.h \
 +  instruction_set.h \
 +  invoke_type.h \
 +  jdwp/jdwp.h \
 +  jdwp/jdwp_constants.h \
 +  lock_word.h \
 +  mirror/class.h \
 +  oat.h \
 +  object_callbacks.h \
 +  quick/inline_method_analyser.h \
 +  thread.h \
 +  thread_state.h \
 +  verifier/method_verifier.h
  
  LIBART_CFLAGS :=
  ifeq ($(ART_USE_PORTABLE_COMPILER),true)

diff --cc runtime/gc/heap.cc
Simple merge

diff --cc runtime/monitor.cc
Simple merge

diff --cc runtime/runtime.h
Simple merge