Merge "Fix hardcoded offsets in x86 String.indexOf."