Merge "Track changes in java.lang.(StringBuilder|String)"