Merge "Remove unused method String.fastIndexOf"
am: bcb82557ba

Change-Id: If0ee6329547c45024df5f4976153e1a86362cfa3