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

Change-Id: I445a603d8c25caaa6ddc4c56b80d452dbc7f449b