Merge "Store resolved Strings for AOT code in .bss."

diff --cc compiler/common_compiler_test.cc
index b726649,60740b6..bc8facd
--- 1/compiler/common_compiler_test.cc
--- 2/compiler/common_compiler_test.cc
+++ b/compiler/common_compiler_test.cc
@@@ -174,8 -174,10 +174,9 @@@ void CommonCompilerTest::SetUp() 
  void CommonCompilerTest::CreateCompilerDriver(Compiler::Kind kind,
                                                InstructionSet isa,
                                                size_t number_of_threads) {
+   compiler_options_->boot_image_ = true;
    compiler_driver_.reset(new CompilerDriver(compiler_options_.get(),
                                              verification_results_.get(),
 -                                            method_inliner_map_.get(),
                                              kind,
                                              isa,
                                              instruction_set_features_.get(),

diff --cc compiler/driver/compiled_method_storage_test.cc
Simple merge

diff --cc compiler/driver/compiler_driver.cc
Simple merge

diff --cc compiler/driver/compiler_driver.h
Simple merge

diff --cc compiler/image_test.cc
Simple merge

diff --cc compiler/jit/jit_compiler.cc
Simple merge

diff --cc compiler/linker/relative_patcher_test.h
Simple merge

diff --cc compiler/oat_test.cc
Simple merge

diff --cc compiler/oat_writer.cc
Simple merge

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

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

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

diff --cc dex2oat/dex2oat.cc
Simple merge

diff --cc oatdump/oatdump.cc
Simple merge

diff --cc runtime/mirror/dex_cache-inl.h
Simple merge