Merge "[automerger skipped] x86 tests: address test failures caused by Text Relocations am: 1dd80b28b3 am: 22097c6093 -s ours am: b1617224bb am: 90c9e29015 am: 57c2da261d" into qt-qpr1-dev-plus-aosp