Merge \\"Replace String.charAt() with HIR.\\" am: 4692c35c15
am: 390ef5197a

Change-Id: I2357f26f22a42b30ad0f49c7a41598d0e79a8d4b