Merge "Simplify const-string.indexOf()."
am: 7e3b455823

Change-Id: Ifbda4dcbc45687ae1de15b9797989b5fcf26ce8d