Merge "Fix bug in vectorization of charAt, with regression test" am: 60efed530d am: 40b5537c77 am: bea264812d
am: e598ccf580

Change-Id: I12e00f07d6a0c61d20f8913037ffcff5a7a03034