Merge "Fix a bug in String.charAt() simplification."
am: 367e020d85

Change-Id: Id292e6e9cc0a89bb9d2af84c452253bb61228696