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