Merge "Track changes in java.lang.(StringBuilder|String)" am: a88102c707
am: d3109d50b9

Change-Id: Ic0fcb5305e1ef2ee0ce8a92c86c484cc857124c1