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

Change-Id: Ib2cceb78b52ac425f8405e17b28c2bcfd42496bc