am a028595f: Merge "Fix hardcoded offsets in x86 String.indexOf."
am a028595f: Merge "Fix hardcoded offsets in x86 String.indexOf."

* commit 'a028595f52b61e855d6dcf75f6bdf129d5568895':
  Fix hardcoded offsets in x86 String.indexOf.

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst