Merge "x86: A couple of minor changes for String.indexOf() inlining"