Merge "Remove String8(StaticLinkage) references." am: 19b9aad80d am: 553896d8e7 am: 584e8003c1 am: 8f95ae1218

Change-Id: I057b488fa336f6b3dea348e092acaefc95c31620