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

Change-Id: I218ac2b0ee9a116b54c9be75fa5c640c21bbdd94