Merge "Revert "Revert "Store resolved Strings for AOT code in .bss.""" am: 129fc43ff9
am: eba59570a2

Change-Id: I1fe1d3fdfb08f27017bf523a61dc599c388fa5aa