Clean up String.indexOf() intrinsics.

Additional cleanup after
    https://android-review.googlesource.com/223260

Bug: 28330359
Change-Id: I88def196babec70123896ef581ec8d61bb1b9a9a
6 files changed