Merge "Tests for String.setCharAt() breaking string compression." am: 530fadac26
am: 62003ebaf0

Change-Id: I333579d3327fbd82ede2ee87c5f33bea72ea826a