Merge "Clean up String.indexOf() intrinsics."
am: 479ac58aa2

* commit '479ac58aa2c16967c9119f4e928ca5fe3c7fd388':
  Clean up String.indexOf() intrinsics.

Change-Id: I033d63aedb19722ce05f4da1f235f0f4b51d787f