Merge "MIPS: Shorten .bss string/class loads" am: 8091ed8a26
am: 185b5e919c

Change-Id: Ie3772421a08ac5a3efe17db86d142fd4beff5af9