Merge "Fix a bug in String.charAt() simplification."