Merge "Thread-local mark stacks for the CC collector."

diff --cc runtime/gc/collector/concurrent_copying.cc
index ccf5154,ac4fc69..9316b27
--- 1/runtime/gc/collector/concurrent_copying.cc
--- 2/runtime/gc/collector/concurrent_copying.cc
+++ b/runtime/gc/collector/concurrent_copying.cc
@@@ -17,9 -17,9 +17,10 @@@
  #include "concurrent_copying.h"
  
  #include "art_field-inl.h"
+ #include "base/stl_util.h"
  #include "gc/accounting/heap_bitmap-inl.h"
  #include "gc/accounting/space_bitmap-inl.h"
 +#include "gc/reference_processor.h"
  #include "gc/space/image_space.h"
  #include "gc/space/space.h"
  #include "intern_table.h"

diff --cc runtime/runtime.cc
Simple merge

diff --cc runtime/runtime.h
Simple merge

diff --cc runtime/thread.cc
Simple merge

diff --cc runtime/thread_list.cc
Simple merge