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

Change-Id: Ieb72fdc4e5e8f2038876aeb2cd60918e416f388d