[automerger skipped] x86 tests: address test failures caused by Text Relocations am: 1dd80b28b3 am: 22097c6093 -s ours am: b1617224bb
am: 90c9e29015

Change-Id: I0cc65d847209387c047c1a051a226c027dbafde0