Merge "Remove String.setCharAt()."
am: 60fde3516d

Change-Id: I9b66011101e153cd45902a7be3f0fd7d8c58d2da