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

Change-Id: Ibf8f80f9517bff298085bd27b3ee687d8b597822