Merge "Revert "Store resolved Strings for AOT code in .bss."" am: 523b5153 am: c8c84076 am: 4e98fb60 am: 72724b05 Change-Id: I2cafee9d9c4132a0f590767a26530e4293f64d70