Merge "Remove String8(StaticLinkage) references." am: 19b9aad80d

Change-Id: Ic98bb955e7adf20e954f015b456ea3c6a791c3ed